bots should use all weapons now

baseq3r/botfiles/inv.h

@@ -108,57 +108,53 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MODELINDEX_PLASMAGUN		15
 #define MODELINDEX_BFG10K			16
 #define MODELINDEX_GRAPPLINGHOOK	17
+//Q3Rally Code Start
 #define MODELINDEX_FLAMETHROWER   18
-#define MODELINDEX_RWPSMOKE    19
-#define MODELINDEX_RWPOIL     20
-#define MODELINDEX_RWPMINE    21
-#define MODELINDEX_RWPFLAME    22
-#define MODELINDEX_RWPBIO      23
+//Q3Rally Code END
 
+#define MODELINDEX_SHELLS			19
+#define MODELINDEX_BULLETS			20
+#define MODELINDEX_GRENADES			21
+#define MODELINDEX_CELLS			22
+#define MODELINDEX_LIGHTNINGAMMO	23
+#define MODELINDEX_ROCKETS			24
+#define MODELINDEX_SLUGS			25
+#define MODELINDEX_BFGAMMO			26
 
-#define MODELINDEX_SHELLS			24
-#define MODELINDEX_BULLETS			25
-#define MODELINDEX_GRENADES			26
-#define MODELINDEX_CELLS			27
-#define MODELINDEX_LIGHTNINGAMMO	28
-#define MODELINDEX_ROCKETS			29
-#define MODELINDEX_SLUGS			30
-#define MODELINDEX_BFGAMMO			31
+#define MODELINDEX_TELEPORTER		27
+#define MODELINDEX_MEDKIT			28
+#define MODELINDEX_QUAD				29
+#define MODELINDEX_ENVIRONMENTSUIT	30
+#define MODELINDEX_HASTE			31
+#define MODELINDEX_INVISIBILITY		32
+#define MODELINDEX_REGEN			33
+#define MODELINDEX_FLIGHT			34
 
-#define MODELINDEX_TELEPORTER		32
-#define MODELINDEX_MEDKIT			33
-#define MODELINDEX_QUAD				34
-#define MODELINDEX_ENVIRONMENTSUIT	35
-#define MODELINDEX_HASTE			36
-#define MODELINDEX_INVISIBILITY		37
-#define MODELINDEX_REGEN			38
-#define MODELINDEX_FLIGHT			39
-
-#define MODELINDEX_REDFLAG			40
-#define MODELINDEX_BLUEFLAG			41
+#define MODELINDEX_REDFLAG			35
+#define MODELINDEX_BLUEFLAG			36
 
 // mission pack only defines
 
-#define MODELINDEX_KAMIKAZE			42
-#define MODELINDEX_PORTAL			43
-#define MODELINDEX_INVULNERABILITY	44
+#define MODELINDEX_KAMIKAZE			37
+#define MODELINDEX_PORTAL			38
+#define MODELINDEX_INVULNERABILITY	39
 
-#define MODELINDEX_NAILS			45
-#define MODELINDEX_MINES			46
-#define MODELINDEX_BELT				47
+#define MODELINDEX_NAILS			40
+#define MODELINDEX_MINES			41
+#define MODELINDEX_BELT				42
 
-#define MODELINDEX_SCOUT			48
-#define MODELINDEX_GUARD			49
-#define MODELINDEX_DOUBLER			50
-#define MODELINDEX_AMMOREGEN		51
+#define MODELINDEX_SCOUT			43
+#define MODELINDEX_GUARD			44
+#define MODELINDEX_DOUBLER			45
+#define MODELINDEX_AMMOREGEN		46
 
-#define MODELINDEX_NEUTRALFLAG		52
-#define MODELINDEX_REDCUBE			53
-#define MODELINDEX_BLUECUBE			54
+#define MODELINDEX_NEUTRALFLAG		47
+#define MODELINDEX_REDCUBE			48
+#define MODELINDEX_BLUECUBE			49
 
-#define MODELINDEX_NAILGUN			55
-#define MODELINDEX_PROXLAUNCHER		56
-#define MODELINDEX_CHAINGUN			57
+#define MODELINDEX_NAILGUN			50
+#define MODELINDEX_PROXLAUNCHER		51
+#define MODELINDEX_CHAINGUN			52
 
 
 //
@@ -172,7 +168,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define WEAPONINDEX_PLASMAGUN			8
 #define WEAPONINDEX_BFG					9
 #define WEAPONINDEX_GRAPPLING_HOOK		10
-#define WEAPONINDEX_FLAMETHROWER   11
-#define WEAPONINDEX_NAILGUN				12
-#define WEAPONINDEX_PROXLAUNCHER		13
-#define WEAPONINDEX_CHAINGUN			14
+#define WEAPONINDEX_NAILGUN				11
+#define WEAPONINDEX_PROXLAUNCHER		12
+#define WEAPONINDEX_CHAINGUN			13

engine/builds/release-linux-x86_64/baseq3r/cgame/cg_rally_hud.asm

@@ -3963,7 +3963,7 @@ byte 1 32
 byte 1 114
 byte 1 49
 byte 1 53
-byte 1 49
+byte 1 55
 byte 1 0
 align 1
 LABELV $480

engine/builds/release-linux-x86_64/baseq3r/game/ai_dmq3.asm

@@ -4060,7 +4060,7 @@ INDIRP4
 CNSTI4 204
 ADDP4
 INDIRI4
-CNSTI4 27
+CNSTI4 32
 NEI4 $435
 ADDRLP4 1144
 CNSTI4 1
@@ -4084,7 +4084,7 @@ INDIRP4
 CNSTI4 204
 ADDP4
 INDIRI4
-CNSTI4 28
+CNSTI4 33
 NEI4 $438
 ADDRLP4 1152
 CNSTI4 1

engine/builds/release-linux-x86_64/baseq3r/ui/ui_menu.asm

@@ -1708,7 +1708,7 @@ byte 1 32
 byte 1 114
 byte 1 49
 byte 1 53
-byte 1 49
+byte 1 55
 byte 1 32
 byte 1 40
 byte 1 99
@@ -1807,7 +1807,7 @@ byte 1 32
 byte 1 114
 byte 1 49
 byte 1 53
-byte 1 49
+byte 1 55
 byte 1 32
 byte 1 40
 byte 1 99

engine/builds/release-linux-x86_64/baseq3r/ui/ui_rally_controls.asm

@@ -24,7 +24,7 @@ byte 4 1
 byte 4 132
 byte 4 -1
 byte 4 -1
-skip 4
+byte 4 -1
 address $89
 address $90
 byte 4 3
@@ -32,7 +32,7 @@ byte 4 2
 byte 4 133
 byte 4 -1
 byte 4 -1
-skip 4
+byte 4 -1
 address $91
 address $92
 byte 4 4
@@ -80,7 +80,7 @@ byte 4 7
 byte 4 134
 byte 4 -1
 byte 4 -1
-skip 4
+byte 4 -1
 address $103
 address $104
 byte 4 10
@@ -88,7 +88,7 @@ byte 4 8
 byte 4 135
 byte 4 -1
 byte 4 -1
-skip 4
+byte 4 -1
 address $105
 address $106
 byte 4 11
@@ -1631,6 +1631,13 @@ CALLP4
 pop
 ADDRLP4 12
 ARGP4
+CNSTP4 0
+ARGP4
+ADDRGP4 strcat
+CALLP4
+pop
+ADDRLP4 12
+ARGP4
 ADDRLP4 56
 ARGP4
 ADDRGP4 strcat

engine/builds/release-linux-x86_64/baseq3r/ui/ui_rally_credits.asm

@@ -1059,7 +1059,7 @@ byte 1 32
 byte 1 114
 byte 1 49
 byte 1 53
-byte 1 49
+byte 1 55
 byte 1 32
 byte 1 40
 byte 1 99

engine/builds/release-linux-x86_64/tools/rcc/dagcheck.c

@@ -6,7 +6,7 @@ typedef Node NODEPTR_TYPE;
 #define STATE_LABEL(p)  ((p)->x.state)
 #define PANIC	   error
 /*
-generated at Tue May 17 11:51:37 2016
+generated at Tue May 17 23:20:08 2016
 by lburg.c - faked rcsid
 */
 static void _kids(NODEPTR_TYPE, int, NODEPTR_TYPE[]);

engine/code/game/inv.h

@@ -108,57 +108,53 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define MODELINDEX_PLASMAGUN		15
 #define MODELINDEX_BFG10K			16
 #define MODELINDEX_GRAPPLINGHOOK	17
+//Q3Rally Code Start
 #define MODELINDEX_FLAMETHROWER   18
-#define MODELINDEX_RWPSMOKE    19
-#define MODELINDEX_RWPOIL     20
-#define MODELINDEX_RWPMINE    21
-#define MODELINDEX_RWPFLAME    22
-#define MODELINDEX_RWPBIO      23
+//Q3Rally Code END
 
+#define MODELINDEX_SHELLS			19
+#define MODELINDEX_BULLETS			20
+#define MODELINDEX_GRENADES			21
+#define MODELINDEX_CELLS			22
+#define MODELINDEX_LIGHTNINGAMMO	23
+#define MODELINDEX_ROCKETS			24
+#define MODELINDEX_SLUGS			25
+#define MODELINDEX_BFGAMMO			26
 
-#define MODELINDEX_SHELLS			24
-#define MODELINDEX_BULLETS			25
-#define MODELINDEX_GRENADES			26
-#define MODELINDEX_CELLS			27
-#define MODELINDEX_LIGHTNINGAMMO	28
-#define MODELINDEX_ROCKETS			29
-#define MODELINDEX_SLUGS			30
-#define MODELINDEX_BFGAMMO			31
+#define MODELINDEX_TELEPORTER		27
+#define MODELINDEX_MEDKIT			28
+#define MODELINDEX_QUAD				29
+#define MODELINDEX_ENVIRONMENTSUIT	30
+#define MODELINDEX_HASTE			31
+#define MODELINDEX_INVISIBILITY		32
+#define MODELINDEX_REGEN			33
+#define MODELINDEX_FLIGHT			34
 
-#define MODELINDEX_TELEPORTER		32
-#define MODELINDEX_MEDKIT			33
-#define MODELINDEX_QUAD				34
-#define MODELINDEX_ENVIRONMENTSUIT	35
-#define MODELINDEX_HASTE			36
-#define MODELINDEX_INVISIBILITY		37
-#define MODELINDEX_REGEN			38
-#define MODELINDEX_FLIGHT			39
-
-#define MODELINDEX_REDFLAG			40
-#define MODELINDEX_BLUEFLAG			41
+#define MODELINDEX_REDFLAG			35
+#define MODELINDEX_BLUEFLAG			36
 
 // mission pack only defines
 
-#define MODELINDEX_KAMIKAZE			42
-#define MODELINDEX_PORTAL			43
-#define MODELINDEX_INVULNERABILITY	44
+#define MODELINDEX_KAMIKAZE			37
+#define MODELINDEX_PORTAL			38
+#define MODELINDEX_INVULNERABILITY	39
 
-#define MODELINDEX_NAILS			45
-#define MODELINDEX_MINES			46
-#define MODELINDEX_BELT				47
+#define MODELINDEX_NAILS			40
+#define MODELINDEX_MINES			41
+#define MODELINDEX_BELT				42
 
-#define MODELINDEX_SCOUT			48
-#define MODELINDEX_GUARD			49
-#define MODELINDEX_DOUBLER			50
-#define MODELINDEX_AMMOREGEN		51
+#define MODELINDEX_SCOUT			43
+#define MODELINDEX_GUARD			44
+#define MODELINDEX_DOUBLER			45
+#define MODELINDEX_AMMOREGEN		46
 
-#define MODELINDEX_NEUTRALFLAG		52
-#define MODELINDEX_REDCUBE			53
-#define MODELINDEX_BLUECUBE			54
+#define MODELINDEX_NEUTRALFLAG		47
+#define MODELINDEX_REDCUBE			48
+#define MODELINDEX_BLUECUBE			49
 
-#define MODELINDEX_NAILGUN			55
-#define MODELINDEX_PROXLAUNCHER		56
-#define MODELINDEX_CHAINGUN			57
+#define MODELINDEX_NAILGUN			50
+#define MODELINDEX_PROXLAUNCHER		51
+#define MODELINDEX_CHAINGUN			52
 
 
 //
@@ -172,7 +168,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define WEAPONINDEX_PLASMAGUN			8
 #define WEAPONINDEX_BFG					9
 #define WEAPONINDEX_GRAPPLING_HOOK		10
-#define WEAPONINDEX_FLAMETHROWER   11
-#define WEAPONINDEX_NAILGUN				12
-#define WEAPONINDEX_PROXLAUNCHER		13
-#define WEAPONINDEX_CHAINGUN			14
+#define WEAPONINDEX_NAILGUN				11
+#define WEAPONINDEX_PROXLAUNCHER		12
+#define WEAPONINDEX_CHAINGUN			13

engine/code/qcommon/q_shared.h

@@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.0.0.4 r157"
+#define PRODUCT_VERSION "v0.0.0.4 r159"
 #endif
 
 #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION

q3rallycode.ppr

@@ -873,7 +873,7 @@ q3rallycode
 13=engine\code\game\g_missile.c
 [Selected Project Files]
 Main=
-Selected=engine\code\game\inv.h
+Selected=engine\code\qcommon\q_shared.h
 [engine\code\qcommon\q_shared.h]
 TopLine=40
 Caret=39,58
@@ -882,18 +882,18 @@ TopLine=778
 Caret=1,819
 [engine\code\game\inv.h]
 TopLine=1
-Caret=34,178
+Caret=34,174
 [baseq3r\botfiles\inv.h]
-TopLine=1
-Caret=34,178
+TopLine=131
+Caret=34,173
 [engine\code\game\bg_misc.c]
-TopLine=456
+TopLine=401
 Caret=18,401
 [engine\code\cgame\cg_rally_rearweapons.c]
 TopLine=69
 Caret=1,83
 [engine\code\cgame\cg_weapons.c]
-TopLine=823
+TopLine=711
 Caret=1,711
 [engine\code\game\bg_pmove.c]
 TopLine=1824