diff --git a/reaction/game/g_combat.c b/reaction/game/g_combat.c index ec7ac068..53ff6cae 100644 --- a/reaction/game/g_combat.c +++ b/reaction/game/g_combat.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.101 2002/06/21 16:54:15 makro +// Crash bug fix +// // Revision 1.100 2002/06/21 15:04:55 makro // Health functionality for movers should be complete now // @@ -2250,8 +2253,11 @@ void G_Damage(gentity_t * targ, gentity_t * inflictor, gentity_t * attacker, attacker->client->ps.persistant[PERS_DAMAGE_DELT] += 100; else attacker->client->ps.persistant[PERS_DAMAGE_DELT] += take; + //Makro - crash bug fix + if (targ && targ->client) { Com_sprintf(attacker->client->last_damaged_players, sizeof(attacker->client->last_damaged_players), "%s^7", targ->client->pers.netname); + } } if (instant_dam) { // G_Printf("(%d) instant damage\n",take); diff --git a/reaction/game/game.plg b/reaction/game/game.plg index 3551c986..073718b8 100644 --- a/reaction/game/game.plg +++ b/reaction/game/game.plg @@ -3,14 +3,146 @@
 

Build Log

---------------------Configuration: game - Win32 Release-------------------- +--------------------Configuration: game - Win32 Debug--------------------

Command Lines

+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP164.tmp" with contents +[ +/nologo /G5 /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "BUILDING_REF_GL" /D "DEBUG" /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\bg_misc.c" +"C:\Games\Quake3\rq3source\reaction\game\bg_pmove.c" +"C:\Games\Quake3\rq3source\reaction\game\bg_slidemove.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\q_math.c" +"C:\Games\Quake3\rq3source\reaction\game\q_shared.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\RSP164.tmp" +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP165.tmp" with contents +[ +kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:yes /pdb:"c:\reactionoutput/qagamex86.pdb" /map:"c:\reactionoutput/qagamex86.map" /debug /machine:I386 /def:".\game.def" /out:"..\Debug/qagamex86.dll" /implib:"c:\reactionoutput/qagamex86.lib" +\reactionoutput\ai_chat.obj +\reactionoutput\ai_cmd.obj +\reactionoutput\ai_dmnet.obj +\reactionoutput\ai_dmq3.obj +\reactionoutput\ai_main.obj +\reactionoutput\ai_team.obj +\reactionoutput\ai_vcmd.obj +\reactionoutput\bg_misc.obj +\reactionoutput\bg_pmove.obj +\reactionoutput\bg_slidemove.obj +\reactionoutput\g_active.obj +\reactionoutput\g_arenas.obj +\reactionoutput\g_bot.obj +\reactionoutput\g_client.obj +\reactionoutput\g_cmds.obj +\reactionoutput\g_combat.obj +\reactionoutput\g_fileio.obj +\reactionoutput\g_items.obj +\reactionoutput\g_main.obj +\reactionoutput\g_matchmode.obj +\reactionoutput\g_mem.obj +\reactionoutput\g_misc.obj +\reactionoutput\g_missile.obj +\reactionoutput\g_mover.obj +\reactionoutput\g_session.obj +\reactionoutput\g_spawn.obj +\reactionoutput\g_svcmds.obj +\reactionoutput\g_syscalls.obj +\reactionoutput\g_target.obj +\reactionoutput\g_team.obj +\reactionoutput\g_teamplay.obj +\reactionoutput\g_trigger.obj +\reactionoutput\g_utils.obj +\reactionoutput\g_weapon.obj +\reactionoutput\q_math.obj +\reactionoutput\q_shared.obj +\reactionoutput\rxn_game.obj +\reactionoutput\zcam.obj +\reactionoutput\zcam_target.obj +] +Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP165.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 +bg_misc.c +bg_pmove.c +bg_slidemove.c +g_active.c +g_arenas.c +g_bot.c +g_client.c +g_cmds.c +C:\Games\Quake3\rq3source\reaction\game\g_cmds.c(1087) : warning C4013: 'ResetKills' undefined; assuming extern returning int +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 +q_math.c +q_shared.c +rxn_game.c +zcam.c +zcam_target.c +Linking... + Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp

Results

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