From c9f307554d1d7c5136a1310b498073cc418ba88f Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Tue, 9 Mar 2004 02:19:01 +0000
Subject: [PATCH] Bug in the reset function for func_trains

---
 reaction/game/g_mover.c |   6 +
 reaction/game/game.plg  | 308 +---------------------------------------
 2 files changed, 13 insertions(+), 301 deletions(-)

diff --git a/reaction/game/g_mover.c b/reaction/game/g_mover.c
index 009c686b..6eef2674 100644
--- a/reaction/game/g_mover.c
+++ b/reaction/game/g_mover.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.75  2004/03/09 02:19:01  makro
+// Bug in the reset function for func_trains
+//
 // Revision 1.74  2004/02/09 10:33:28  makro
 // no message
 //
@@ -2423,6 +2426,9 @@ void Reset_Func_Train(gentity_t *ent)
 	if (!ent->nextTrain)
 		return;
 	VectorClear(ent->r.currentAngles);
+	VectorClear(ent->s.apos.trBase);
+	ent->s.apos.trType = TR_STATIONARY;
+	ent->s.apos.trTime = level.time;
 	Think_BeginMoving(ent);
 }
 
diff --git a/reaction/game/game.plg b/reaction/game/game.plg
index b393f22c..5d3709a4 100644
--- a/reaction/game/game.plg
+++ b/reaction/game/game.plg
@@ -3,198 +3,16 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: cgame - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6228.tmp" with contents
-[
-/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/cgame.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c 
-"D:\Work\rq3source\reaction\game\bg_misc.c"
-"D:\Work\rq3source\reaction\game\bg_pmove.c"
-"D:\Work\rq3source\reaction\game\bg_slidemove.c"
-"D:\Work\rq3source\reaction\cgame\cg_atmospheric.c"
-"D:\Work\rq3source\reaction\cgame\cg_consolecmds.c"
-"D:\Work\rq3source\reaction\cgame\cg_draw.c"
-"D:\Work\rq3source\reaction\cgame\cg_drawtools.c"
-"D:\Work\rq3source\reaction\cgame\cg_effects.c"
-"D:\Work\rq3source\reaction\cgame\cg_ents.c"
-"D:\Work\rq3source\reaction\cgame\cg_event.c"
-"D:\Work\rq3source\reaction\cgame\cg_info.c"
-"D:\Work\rq3source\reaction\cgame\cg_localents.c"
-"D:\Work\rq3source\reaction\cgame\cg_main.c"
-"D:\Work\rq3source\reaction\cgame\cg_marks.c"
-"D:\Work\rq3source\reaction\cgame\cg_players.c"
-"D:\Work\rq3source\reaction\cgame\cg_playerstate.c"
-"D:\Work\rq3source\reaction\cgame\cg_predict.c"
-"D:\Work\rq3source\reaction\cgame\cg_scoreboard.c"
-"D:\Work\rq3source\reaction\cgame\cg_servercmds.c"
-"D:\Work\rq3source\reaction\cgame\cg_snapshot.c"
-"D:\Work\rq3source\reaction\cgame\cg_syscalls.c"
-"D:\Work\rq3source\reaction\cgame\cg_unlagged.c"
-"D:\Work\rq3source\reaction\cgame\cg_view.c"
-"D:\Work\rq3source\reaction\cgame\cg_weapons.c"
-"D:\Work\rq3source\reaction\game\q_math.c"
-"D:\Work\rq3source\reaction\game\q_shared.c"
-"D:\Work\rq3source\reaction\ui\ui_shared.c"
-]
-Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6228.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6229.tmp" with contents
-[
-/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/cgamex86.pdb" /map:"D:\Work\rq3source\reaction\Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"D:\Work\rq3source\reaction\Release\cgamex86.dll" /implib:"D:\Work\rq3source\reaction\Release/cgamex86.lib" 
-\Work\rq3source\reaction\Release\bg_misc.obj
-\Work\rq3source\reaction\Release\bg_pmove.obj
-\Work\rq3source\reaction\Release\bg_slidemove.obj
-\Work\rq3source\reaction\Release\cg_atmospheric.obj
-\Work\rq3source\reaction\Release\cg_consolecmds.obj
-\Work\rq3source\reaction\Release\cg_draw.obj
-\Work\rq3source\reaction\Release\cg_drawtools.obj
-\Work\rq3source\reaction\Release\cg_effects.obj
-\Work\rq3source\reaction\Release\cg_ents.obj
-\Work\rq3source\reaction\Release\cg_event.obj
-\Work\rq3source\reaction\Release\cg_info.obj
-\Work\rq3source\reaction\Release\cg_localents.obj
-\Work\rq3source\reaction\Release\cg_main.obj
-\Work\rq3source\reaction\Release\cg_marks.obj
-\Work\rq3source\reaction\Release\cg_players.obj
-\Work\rq3source\reaction\Release\cg_playerstate.obj
-\Work\rq3source\reaction\Release\cg_predict.obj
-\Work\rq3source\reaction\Release\cg_scoreboard.obj
-\Work\rq3source\reaction\Release\cg_servercmds.obj
-\Work\rq3source\reaction\Release\cg_snapshot.obj
-\Work\rq3source\reaction\Release\cg_syscalls.obj
-\Work\rq3source\reaction\Release\cg_unlagged.obj
-\Work\rq3source\reaction\Release\cg_view.obj
-\Work\rq3source\reaction\Release\cg_weapons.obj
-\Work\rq3source\reaction\Release\q_math.obj
-\Work\rq3source\reaction\Release\q_shared.obj
-\Work\rq3source\reaction\Release\ui_shared.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6229.tmp"
-<h3>Output Window</h3>
-Compiling...
-bg_misc.c
-bg_pmove.c
-bg_slidemove.c
-cg_atmospheric.c
-cg_consolecmds.c
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(626) : warning C4706: assignment within conditional expression
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(638) : warning C4706: assignment within conditional expression
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(184) : warning C4701: local variable 'tr' may be used without having been initialized
-D:\Work\rq3source\reaction\cgame\cg_atmospheric.c(334) : warning C4701: local variable 'tr' may be used without having been initialized
-cg_draw.c
-cg_drawtools.c
-cg_effects.c
-cg_ents.c
-cg_event.c
-cg_info.c
-cg_localents.c
-cg_main.c
-cg_marks.c
-cg_players.c
-cg_playerstate.c
-cg_predict.c
-cg_scoreboard.c
-D:\Work\rq3source\reaction\cgame\cg_predict.c(805) : warning C4701: local variable 'predictCmd' may be used without having been initialized
-D:\Work\rq3source\reaction\cgame\cg_predict.c(809) : warning C4701: local variable 'stateIndex' may be used without having been initialized
-cg_servercmds.c
-cg_snapshot.c
-cg_syscalls.c
-cg_unlagged.c
-cg_view.c
-cg_weapons.c
-q_math.c
-q_shared.c
-ui_shared.c
-Linking...
-   Creating library D:\Work\rq3source\reaction\Release/cgamex86.lib and object D:\Work\rq3source\reaction\Release/cgamex86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP622D.tmp" with contents
-[
-/nologo /o"D:\Work\rq3source\reaction\Release/cgame.bsc" 
-\Work\rq3source\reaction\Release\bg_misc.sbr
-\Work\rq3source\reaction\Release\bg_pmove.sbr
-\Work\rq3source\reaction\Release\bg_slidemove.sbr
-\Work\rq3source\reaction\Release\cg_atmospheric.sbr
-\Work\rq3source\reaction\Release\cg_consolecmds.sbr
-\Work\rq3source\reaction\Release\cg_draw.sbr
-\Work\rq3source\reaction\Release\cg_drawtools.sbr
-\Work\rq3source\reaction\Release\cg_effects.sbr
-\Work\rq3source\reaction\Release\cg_ents.sbr
-\Work\rq3source\reaction\Release\cg_event.sbr
-\Work\rq3source\reaction\Release\cg_info.sbr
-\Work\rq3source\reaction\Release\cg_localents.sbr
-\Work\rq3source\reaction\Release\cg_main.sbr
-\Work\rq3source\reaction\Release\cg_marks.sbr
-\Work\rq3source\reaction\Release\cg_players.sbr
-\Work\rq3source\reaction\Release\cg_playerstate.sbr
-\Work\rq3source\reaction\Release\cg_predict.sbr
-\Work\rq3source\reaction\Release\cg_scoreboard.sbr
-\Work\rq3source\reaction\Release\cg_servercmds.sbr
-\Work\rq3source\reaction\Release\cg_snapshot.sbr
-\Work\rq3source\reaction\Release\cg_syscalls.sbr
-\Work\rq3source\reaction\Release\cg_unlagged.sbr
-\Work\rq3source\reaction\Release\cg_view.sbr
-\Work\rq3source\reaction\Release\cg_weapons.sbr
-\Work\rq3source\reaction\Release\q_math.sbr
-\Work\rq3source\reaction\Release\q_shared.sbr
-\Work\rq3source\reaction\Release\ui_shared.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP622D.tmp"
-Creating browse info file...
-<h3>Output Window</h3>
-
-
-
-<h3>Results</h3>
-cgamex86.dll - 0 error(s), 6 warning(s)
-<h3>
 --------------------Configuration: game - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP622E.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E7.tmp" with contents
 [
 /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/game.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c 
-"D:\Work\rq3source\reaction\game\ai_chat.c"
-"D:\Work\rq3source\reaction\game\ai_cmd.c"
-"D:\Work\rq3source\reaction\game\ai_dmnet.c"
-"D:\Work\rq3source\reaction\game\ai_dmq3.c"
-"D:\Work\rq3source\reaction\game\ai_main.c"
-"D:\Work\rq3source\reaction\game\ai_team.c"
-"D:\Work\rq3source\reaction\game\ai_vcmd.c"
-"D:\Work\rq3source\reaction\game\bg_misc.c"
-"D:\Work\rq3source\reaction\game\bg_pmove.c"
-"D:\Work\rq3source\reaction\game\bg_slidemove.c"
-"D:\Work\rq3source\reaction\game\g_active.c"
-"D:\Work\rq3source\reaction\game\g_arenas.c"
-"D:\Work\rq3source\reaction\game\g_bot.c"
-"D:\Work\rq3source\reaction\game\g_client.c"
-"D:\Work\rq3source\reaction\game\g_cmds.c"
-"D:\Work\rq3source\reaction\game\g_combat.c"
-"D:\Work\rq3source\reaction\game\g_fileio.c"
-"D:\Work\rq3source\reaction\game\g_items.c"
-"D:\Work\rq3source\reaction\game\g_main.c"
-"D:\Work\rq3source\reaction\game\g_matchmode.c"
-"D:\Work\rq3source\reaction\game\g_mem.c"
-"D:\Work\rq3source\reaction\game\g_misc.c"
-"D:\Work\rq3source\reaction\game\g_missile.c"
 "D:\Work\rq3source\reaction\game\g_mover.c"
-"D:\Work\rq3source\reaction\game\g_session.c"
-"D:\Work\rq3source\reaction\game\g_spawn.c"
-"D:\Work\rq3source\reaction\game\g_svcmds.c"
-"D:\Work\rq3source\reaction\game\g_syscalls.c"
-"D:\Work\rq3source\reaction\game\g_target.c"
-"D:\Work\rq3source\reaction\game\g_team.c"
-"D:\Work\rq3source\reaction\game\g_teamplay.c"
-"D:\Work\rq3source\reaction\game\g_trigger.c"
-"D:\Work\rq3source\reaction\game\g_unlagged.c"
-"D:\Work\rq3source\reaction\game\g_utils.c"
-"D:\Work\rq3source\reaction\game\g_weapon.c"
-"D:\Work\rq3source\reaction\game\q_math.c"
-"D:\Work\rq3source\reaction\game\q_shared.c"
-"D:\Work\rq3source\reaction\game\rxn_game.c"
-"D:\Work\rq3source\reaction\game\zcam.c"
-"D:\Work\rq3source\reaction\game\zcam_target.c"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP622E.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP622F.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E7.tmp" 
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E8.tmp" with contents
 [
 kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/qagamex86.pdb" /map:"D:\Work\rq3source\reaction\Release/qagamex86.map" /machine:I386 /def:".\game.def" /out:"D:\Work\rq3source\reaction\Release\qagamex86.dll" /implib:"D:\Work\rq3source\reaction\Release/qagamex86.lib" 
 \Work\rq3source\reaction\Release\ai_chat.obj
@@ -238,56 +56,13 @@ kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows
 \Work\rq3source\reaction\Release\zcam.obj
 \Work\rq3source\reaction\Release\zcam_target.obj
 ]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP622F.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E8.tmp"
 <h3>Output Window</h3>
 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
-D:\Work\rq3source\reaction\game\g_client.c(1640) : warning C4701: local variable 'classname' may be used without having been initialized
-D:\Work\rq3source\reaction\game\g_cmds.c(2479) : warning C4189: 'door' : local variable is initialized but not referenced
-g_combat.c
-g_fileio.c
-D:\Work\rq3source\reaction\game\g_combat.c(2014) : 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_unlagged.c
-g_utils.c
-g_weapon.c
-q_math.c
-D:\Work\rq3source\reaction\game\g_weapon.c(1954) : warning C4701: local variable 'tr' may be used without having been initialized
-q_shared.c
-rxn_game.c
-zcam.c
-zcam_target.c
 Linking...
    Creating library D:\Work\rq3source\reaction\Release/qagamex86.lib and object D:\Work\rq3source\reaction\Release/qagamex86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6233.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2EC.tmp" with contents
 [
 /nologo /o"D:\Work\rq3source\reaction\Release/game.bsc" 
 \Work\rq3source\reaction\Release\ai_chat.sbr
@@ -330,83 +105,14 @@ Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6233.tmp" with cont
 \Work\rq3source\reaction\Release\rxn_game.sbr
 \Work\rq3source\reaction\Release\zcam.sbr
 \Work\rq3source\reaction\Release\zcam_target.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6233.tmp"
+Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2EC.tmp"
 Creating browse info file...
 <h3>Output Window</h3>
 
 
 
 <h3>Results</h3>
-qagamex86.dll - 0 error(s), 4 warning(s)
-<h3>
---------------------Configuration: ui - Win32 Release TA--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6234.tmp" with contents
-[
-/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /FR"D:\Work\rq3source\reaction\Release/" /Fp"D:\Work\rq3source\reaction\Release/ta_ui.pch" /YX /Fo"D:\Work\rq3source\reaction\Release/" /Fd"D:\Work\rq3source\reaction\Release/" /FD /c 
-"D:\Work\rq3source\reaction\game\bg_misc.c"
-"D:\Work\rq3source\reaction\game\q_math.c"
-"D:\Work\rq3source\reaction\game\q_shared.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_atoms.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_gameinfo.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_main.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_players.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_shared.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_syscalls.c"
-"D:\Work\rq3source\reaction\ta_ui\ui_util.c"
-]
-Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6234.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6235.tmp" with contents
-[
-/nologo /base:"0x40000000" /dll /incremental:no /pdb:"D:\Work\rq3source\reaction\Release/uix86.pdb" /map:"D:\Work\rq3source\reaction\Release/uix86.map" /machine:I386 /def:".\ui.def" /out:"D:\Work\rq3source\reaction\Release\uix86.dll" /implib:"D:\Work\rq3source\reaction\Release/uix86.lib" 
-\Work\rq3source\reaction\Release\bg_misc.obj
-\Work\rq3source\reaction\Release\q_math.obj
-\Work\rq3source\reaction\Release\q_shared.obj
-\Work\rq3source\reaction\Release\ui_atoms.obj
-\Work\rq3source\reaction\Release\ui_gameinfo.obj
-\Work\rq3source\reaction\Release\ui_main.obj
-\Work\rq3source\reaction\Release\ui_players.obj
-\Work\rq3source\reaction\Release\ui_shared.obj
-\Work\rq3source\reaction\Release\ui_syscalls.obj
-\Work\rq3source\reaction\Release\ui_util.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6235.tmp"
-<h3>Output Window</h3>
-Compiling...
-bg_misc.c
-q_math.c
-q_shared.c
-ui_atoms.c
-ui_gameinfo.c
-ui_main.c
-ui_players.c
-ui_shared.c
-ui_syscalls.c
-ui_util.c
-Linking...
-   Creating library D:\Work\rq3source\reaction\Release/uix86.lib and object D:\Work\rq3source\reaction\Release/uix86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6239.tmp" with contents
-[
-/nologo /o"D:\Work\rq3source\reaction\Release/ta_ui.bsc" 
-\Work\rq3source\reaction\Release\bg_misc.sbr
-\Work\rq3source\reaction\Release\q_math.sbr
-\Work\rq3source\reaction\Release\q_shared.sbr
-\Work\rq3source\reaction\Release\ui_atoms.sbr
-\Work\rq3source\reaction\Release\ui_gameinfo.sbr
-\Work\rq3source\reaction\Release\ui_main.sbr
-\Work\rq3source\reaction\Release\ui_players.sbr
-\Work\rq3source\reaction\Release\ui_shared.sbr
-\Work\rq3source\reaction\Release\ui_syscalls.sbr
-\Work\rq3source\reaction\Release\ui_util.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP6239.tmp"
-Creating browse info file...
-<h3>Output Window</h3>
-
-
-
-<h3>Results</h3>
-uix86.dll - 0 error(s), 0 warning(s)
+qagamex86.dll - 0 error(s), 0 warning(s)
 </pre>
 </body>
 </html>