From 9be5e1d5b337615452c63be1f047299530cb2300 Mon Sep 17 00:00:00 2001 From: Andrei Drexler Date: Tue, 2 Jul 2002 18:30:53 +0000 Subject: [PATCH] Fixed bug with akimbo/pistol clips in TP --- reaction/game/g_teamplay.c | 6 ++- reaction/game/game.plg | 77 +++----------------------------------- 2 files changed, 10 insertions(+), 73 deletions(-) diff --git a/reaction/game/g_teamplay.c b/reaction/game/g_teamplay.c index 9ba4dabe..b10e4cb2 100644 --- a/reaction/game/g_teamplay.c +++ b/reaction/game/g_teamplay.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.120 2002/07/02 18:30:53 makro +// Fixed bug with akimbo/pistol clips in TP +// // Revision 1.119 2002/07/02 03:41:59 jbravo // Fixed a 2 frags pr kill bug, the use cmd now cancels weaponchanges in progress // and fixed the captain status lingering on people after switching from MM @@ -1105,7 +1108,8 @@ void EquipPlayer(gentity_t * ent) ent->client->ps.stats[STAT_WEAPONS] = (1 << WP_AKIMBO); ent->client->ps.stats[STAT_WEAPONS] |= (1 << WP_PISTOL); ent->client->ps.stats[STAT_WEAPONS] |= (1 << WP_KNIFE); - ent->client->numClips[WP_AKIMBO] = RQ3_AKIMBO_EXTRA_AMMO * bandolierFactor; + //Makro - added pistol clips + ent->client->numClips[WP_PISTOL] = ent->client->numClips[WP_AKIMBO] = RQ3_AKIMBO_EXTRA_AMMO * bandolierFactor; ent->client->ps.ammo[WP_AKIMBO] = RQ3_AKIMBO_AMMO; ent->client->ps.weapon = WP_AKIMBO; ent->client->ps.weaponTime = RQ3_AKIMBO_ACTIVATE_DELAY; diff --git a/reaction/game/game.plg b/reaction/game/game.plg index a92e8116..2724e398 100644 --- a/reaction/game/game.plg +++ b/reaction/game/game.plg @@ -6,46 +6,13 @@ --------------------Configuration: game - Win32 Release--------------------

Command Lines

-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP616.tmp" with contents +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP65C.tmp" with contents [ /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"c:\reactionoutput/" /Fp"c:\reactionoutput/game.pch" /YX /Fo"c:\reactionoutput/" /Fd"c:\reactionoutput/" /FD /c -"C:\Games\Quake3\rq3source\reaction\game\ai_chat.c" -"C:\Games\Quake3\rq3source\reaction\game\ai_cmd.c" -"C:\Games\Quake3\rq3source\reaction\game\ai_dmnet.c" -"C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c" -"C:\Games\Quake3\rq3source\reaction\game\ai_main.c" -"C:\Games\Quake3\rq3source\reaction\game\ai_team.c" -"C:\Games\Quake3\rq3source\reaction\game\ai_vcmd.c" -"C:\Games\Quake3\rq3source\reaction\game\g_active.c" -"C:\Games\Quake3\rq3source\reaction\game\g_arenas.c" -"C:\Games\Quake3\rq3source\reaction\game\g_bot.c" -"C:\Games\Quake3\rq3source\reaction\game\g_client.c" -"C:\Games\Quake3\rq3source\reaction\game\g_cmds.c" -"C:\Games\Quake3\rq3source\reaction\game\g_combat.c" -"C:\Games\Quake3\rq3source\reaction\game\g_fileio.c" -"C:\Games\Quake3\rq3source\reaction\game\g_items.c" -"C:\Games\Quake3\rq3source\reaction\game\g_main.c" -"C:\Games\Quake3\rq3source\reaction\game\g_matchmode.c" -"C:\Games\Quake3\rq3source\reaction\game\g_mem.c" -"C:\Games\Quake3\rq3source\reaction\game\g_misc.c" -"C:\Games\Quake3\rq3source\reaction\game\g_missile.c" -"C:\Games\Quake3\rq3source\reaction\game\g_mover.c" -"C:\Games\Quake3\rq3source\reaction\game\g_session.c" -"C:\Games\Quake3\rq3source\reaction\game\g_spawn.c" -"C:\Games\Quake3\rq3source\reaction\game\g_svcmds.c" -"C:\Games\Quake3\rq3source\reaction\game\g_syscalls.c" -"C:\Games\Quake3\rq3source\reaction\game\g_target.c" -"C:\Games\Quake3\rq3source\reaction\game\g_team.c" "C:\Games\Quake3\rq3source\reaction\game\g_teamplay.c" -"C:\Games\Quake3\rq3source\reaction\game\g_trigger.c" -"C:\Games\Quake3\rq3source\reaction\game\g_utils.c" -"C:\Games\Quake3\rq3source\reaction\game\g_weapon.c" -"C:\Games\Quake3\rq3source\reaction\game\rxn_game.c" -"C:\Games\Quake3\rq3source\reaction\game\zcam.c" -"C:\Games\Quake3\rq3source\reaction\game\zcam_target.c" ] -Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP616.tmp" -Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP617.tmp" with contents +Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP65C.tmp" +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP65D.tmp" with contents [ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /machine:I386 /def:".\game.def" /out:"..\Release/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib" \reactionoutput\ai_chat.obj @@ -88,51 +55,17 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows \reactionoutput\zcam.obj \reactionoutput\zcam_target.obj ] -Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP617.tmp" +Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP65D.tmp"

Output Window

Compiling... -ai_chat.c -ai_cmd.c -ai_dmnet.c -ai_dmq3.c -ai_main.c -ai_team.c -ai_vcmd.c -g_active.c -g_arenas.c -g_bot.c -g_client.c -g_cmds.c -g_combat.c -g_fileio.c -g_items.c -g_main.c -g_matchmode.c -g_mem.c -g_misc.c -g_missile.c -g_mover.c -g_session.c -g_spawn.c -g_svcmds.c -g_syscalls.c -g_target.c -g_team.c g_teamplay.c -g_trigger.c -g_utils.c -g_weapon.c -rxn_game.c -C:\Games\Quake3\rq3source\reaction\game\g_weapon.c(2213) : warning C4701: local variable 'tr' may be used without having been initialized -zcam.c -zcam_target.c Linking... Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp

Results

-qagamex86.dll - 0 error(s), 1 warning(s) +qagamex86.dll - 0 error(s), 0 warning(s)