diff --git a/reaction/ChangeLog b/reaction/ChangeLog index cfc04667..3a802204 100644 --- a/reaction/ChangeLog +++ b/reaction/ChangeLog @@ -213,4 +213,8 @@ * Added pirate and pikey radio sets. cg_RQ3_radiovoice 0, 1, 2 or 3 * Added CTB radio commands to all radio sets. * Added spawnflag 8 to breakables and func_buttons to allow them to be unkickable - +* Made it so that explosions from explosive breakables that have either damage or damageradius + set to 0 don't hurt the players +* Changing the "model" cvar in the console now causes the player model preview and the model icon + selection to be updated immediately +* Added "Hear All" option to the ref menu \ No newline at end of file diff --git a/reaction/game/g_misc.c b/reaction/game/g_misc.c index f033e88f..a05030fc 100644 --- a/reaction/game/g_misc.c +++ b/reaction/game/g_misc.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.64 2003/02/13 21:19:50 makro +// no message +// // Revision 1.63 2003/01/11 17:42:18 makro // Fixed a bug in the sky portal code // @@ -656,7 +659,9 @@ void func_breakable_die(gentity_t * self, gentity_t * inflictor, gentity_t * att { func_breakable_explode(self, self->s.origin); // G_ExplodeMissile(self); - G_RadiusDamage(self->s.origin, attacker, self->damage, self->damage_radius, self, meansOfDeath); + //Makro - added check + if (self->damage > 0 && self->damage_radius > 0) + G_RadiusDamage(self->s.origin, attacker, self->damage, self->damage_radius, self, meansOfDeath); // radius damage trap_UnlinkEntity(self); diff --git a/reaction/game/game.plg b/reaction/game/game.plg index 445788d5..f690f068 100644 --- a/reaction/game/game.plg +++ b/reaction/game/game.plg @@ -3,58 +3,16 @@
Build Log
---------------------Configuration: cgame - Win32 Release-------------------- -
-Command Lines
- - - -Results
-cgamex86.dll - 0 error(s), 0 warning(s) ---------------------Configuration: game - Win32 Release--------------------
Command Lines
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP14.tmp" with contents +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC8.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\RSP14.tmp" -Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP15.tmp" with contents +Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC8.tmp" +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC9.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 @@ -97,64 +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\RSP15.tmp" +Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSPC9.tmp"Output Window
Compiling... -ai_chat.c -ai_cmd.c -ai_dmnet.c -ai_dmq3.c -C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c(2703) : warning C4101: 'info1' : unreferenced local variable -C:\Games\Quake3\rq3source\reaction\game\ai_dmq3.c(2703) : warning C4101: 'info2' : unreferenced local variable -ai_main.c -ai_team.c -ai_vcmd.c -g_active.c -g_arenas.c -g_bot.c -g_client.c -g_cmds.c -C:\Games\Quake3\rq3source\reaction\game\g_client.c(1572) : warning C4701: local variable 'classname' may be used without having been initialized -g_combat.c -g_fileio.c -C:\Games\Quake3\rq3source\reaction\game\g_combat.c(2123) : warning C4700: local variable 'asave' used without having been initialized -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(1998) : 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.expResults
-qagamex86.dll - 0 error(s), 5 warning(s) ----------------------Configuration: ui - Win32 Release TA-------------------- -
-Command Lines
- - - -Results
-uix86.dll - 0 error(s), 0 warning(s) +qagamex86.dll - 0 error(s), 0 warning(s)