From 15b11f3215ceb2a02630ed6258aa4041e94108ca Mon Sep 17 00:00:00 2001 From: Andrei Drexler Date: Mon, 13 May 2002 04:41:26 +0000 Subject: [PATCH] Bug with doors (mine !) --- reaction/game/g_mover.c | 26 +++++++----- reaction/game/game.plg | 92 ++++++++++++++++++++++++----------------- 2 files changed, 70 insertions(+), 48 deletions(-) diff --git a/reaction/game/g_mover.c b/reaction/game/g_mover.c index ba8aea65..567eec4b 100644 --- a/reaction/game/g_mover.c +++ b/reaction/game/g_mover.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.29 2002/05/13 04:41:26 makro +// Bug with doors (mine !) +// // Revision 1.28 2002/05/11 12:45:25 makro // Spectators can go through breakables and doors with // a targetname or health. Bots should crouch more/jump less @@ -1279,16 +1282,19 @@ void Think_SpawnNewDoorTrigger( gentity_t *ent ) { // NiceAss: This trigger will be for players // create a trigger with this size - other = G_Spawn (); - other->classname = "door_trigger"; - VectorCopy (mins, other->r.mins); - VectorCopy (maxs, other->r.maxs); - other->parent = ent; - other->r.contents = CONTENTS_TRIGGER; - other->touch = Touch_DoorTrigger; - // remember the thinnest axis - other->count = best; - trap_LinkEntity (other); + // Makro - we only want these for doors without health & targetname + if (!(ent->targetname) && !ent->health) { + other = G_Spawn (); + other->classname = "door_trigger"; + VectorCopy (mins, other->r.mins); + VectorCopy (maxs, other->r.maxs); + other->parent = ent; + other->r.contents = CONTENTS_TRIGGER; + other->touch = Touch_DoorTrigger; + // remember the thinnest axis + other->count = best; + trap_LinkEntity (other); + } // NiceAss: This trigger will be for spectators // NiceAss: Undo the stretched box size diff --git a/reaction/game/game.plg b/reaction/game/game.plg index e4a8588d..3bd4b11f 100644 --- a/reaction/game/game.plg +++ b/reaction/game/game.plg @@ -3,58 +3,74 @@ 
 
Build Log

 

---------------------Configuration: cgame - Win32 Release--------------------
-

-
Command Lines

-
-
-
-
Results

-cgamex86.dll - 0 error(s), 0 warning(s)
-

 --------------------Configuration: game - Win32 Release--------------------
 

 
Command Lines

-
-
-
-
Results

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

---------------------Configuration: ui - Win32 Release TA--------------------
-

-
Command Lines

-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP497.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BB.tmp" with contents
 [
-/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /Fp"Release_TA/ta_ui.pch" /YX /Fo"Release_TA/" /Fd"Release_TA/" /FD /c 
-"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
+/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\bg_misc.c"
+"C:\Games\Quake3\rq3source\reaction\game\g_mover.c"
+"C:\Games\Quake3\rq3source\reaction\game\g_weapon.c"
 ]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP497.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP498.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BB.tmp" 
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BC.tmp" with contents
 [
-/nologo /base:"0x40000000" /dll /incremental:no /pdb:"Release_TA/uix86.pdb" /map:"Release_TA/uix86.map" /machine:I386 /def:".\ui.def" /out:"uix86.dll" /implib:"Release_TA/uix86.lib" 
-.\Release_TA\bg_misc.obj
-.\Release_TA\q_math.obj
-.\Release_TA\q_shared.obj
-.\Release_TA\ui_atoms.obj
-.\Release_TA\ui_gameinfo.obj
-.\Release_TA\ui_main.obj
-.\Release_TA\ui_players.obj
-.\Release_TA\ui_shared.obj
-.\Release_TA\ui_syscalls.obj
-.\Release_TA\ui_util.obj
+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
+\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\RSP498.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP4BC.tmp"
 
Output Window

 Compiling...
-ui_main.c
+bg_misc.c
+g_mover.c
+g_weapon.c
+C:\Games\Quake3\rq3source\reaction\game\g_weapon.c(2690) : warning C4701: local variable 'tr' may be used without having been initialized
 Linking...
-   Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
+   Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
 
 
 
 
Results

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