kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/next' into release_v1.3

Browse Source
This commit is contained in:
drian
2021-02-10 21:00:09 +01:00
parent bc6941d30c cb51e9f422
commit b615fe449e
58 changed files with 4340 additions and 3913 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/bot/ac_bot.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ extern void spawnstate(playerent *d);
void CACBot::Spawn()
{
// Init all bot variabeles
m_pMyEnt->nextprimary = 2 + rnd(5); // 2011jan18:ft: 2 == GUN_CARBINE, GUN_SHOTGUN, GUN_SUBGUN, GUN_SNIPER, GUN_ASSAULT - if CPISTOL is activated this needs a FIXME to rnd(6)
m_pMyEnt->nextprimary = 2 + rnd(5); // 2 == GUN_CARBINE, GUN_SHOTGUN, GUN_SUBGUN, GUN_SNIPER, GUN_ASSAULT
m_pMyEnt->targetyaw = m_pMyEnt->targetpitch = 0.0f;
m_pMyEnt->pBot = this;
source/src/bot/ac_bot.h
+1 -1
View File
@@ -14,7 +14,7 @@
#define AC_BOT_H
//#define BOTDEBUG
#define MAX_WEAPONS 10
#define MAX_WEAPONS 9 // NUM_GUNS
class CACBot: public CBot
{
source/src/bot/ac_bot_ai.cpp
-1
View File
@@ -24,7 +24,6 @@ weaponinfo_s WeaponInfoTable[MAX_WEAPONS] =
{ TYPE_AUTO, 0.0f, 25.0f, 3.0f, 60.0f, 10 }, // SUBGUN
{ TYPE_SNIPER, 10.0f, 125.0f, 3.0f, 200.0f, 3 }, // SNIPER
{ TYPE_AUTO, 20.0f, 80.0f, 3.0f, 150.0f, 6 }, // ASSAULT
{ TYPE_AUTO, 0.0f, 0.0f, 3.0f, 0.0f, 6 }, // CPISTOL
{ TYPE_GRENADE, 5.0f, 30.0f, 3.0f, 50.0f, 1 }, // GRENADE
{ TYPE_AUTO, 0.0f, 50.0f, 3.0f, 50.0f, 0 } // AKIMBO
};
source/src/bot/bot.cpp
-1
View File
@@ -17,7 +17,6 @@ vector<botent *> bots;
extern int triggertime;
extern itemstat itemstats[];
extern ENetHost *clienthost;
const vec g_vecZero(0, 0, 0);
source/src/bot/bot_waypoint.cpp
+1 -4
View File
@@ -15,11 +15,8 @@ vec v_debuggoal = g_vecZero;
CACWaypointClass WaypointClass;
VAR(xhairwpsel, 0, 1, 1);
// FIXME: multiple selections support ?
// well, TBH I haven't groked this myself yet, but the following curselection segfaults the client, so I'm just putting in a sane-variant until someone groks it ;-) - ft 2011sep28
extern vector<block> sels;
//#define curselection (xhairwpsel ? vec(sels.last().x, sels.last().y, S(sels.last().x, sels.last().y)->floor+2.0f) : vec(player1->o.x, player1->o.y, player1->o.z))
#define curselection (vec(player1->o.x, player1->o.y, player1->o.z))
#define curselection (xhairwpsel && sels.length() ? vec(sels.last().x, sels.last().y, S(sels.last().x, sels.last().y)->floor+2.0f) : vec(player1->o.x, player1->o.y, player1->o.z))
// Waypoint class begin