From 3783897e7679d3d1c9d4e18767c41cec7e88ecea Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Wed, 4 Feb 2004 00:42:23 +0000
Subject: [PATCH] no message

---
 reaction/cgame/cgame.dsp    |   6 +-
 reaction/game/g_mover.c     |   5 +
 reaction/game/game.dsp      |   6 +-
 reaction/game/game.plg      | 474 +++++++-----------------------------
 reaction/ta_ui/ta_ui.dsp    |   6 +-
 reaction/uifiles/setup.menu |   6 +-
 6 files changed, 107 insertions(+), 396 deletions(-)

diff --git a/reaction/cgame/cgame.dsp b/reaction/cgame/cgame.dsp
index f0147002..4024eec2 100644
--- a/reaction/cgame/cgame.dsp
+++ b/reaction/cgame/cgame.dsp
@@ -40,8 +40,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "D:\Work\rq3source\reaction\Release"
+# PROP Intermediate_Dir "D:\Work\rq3source\reaction\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
@@ -55,7 +55,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 /nologo /base:"0x30000000" /subsystem:windows /dll /map /machine:I386 /out:"../Release/cgamex86.dll"
+# ADD LINK32 /nologo /base:"0x30000000" /subsystem:windows /dll /map /machine:I386 /out:"D:\Work\rq3source\reaction\Release\cgamex86.dll"
 # SUBTRACT LINK32 /debug
 
 !ELSEIF  "$(CFG)" == "cgame - Win32 Debug"
diff --git a/reaction/game/g_mover.c b/reaction/game/g_mover.c
index d9128e26..487c460e 100644
--- a/reaction/game/g_mover.c
+++ b/reaction/game/g_mover.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.72  2004/02/04 00:42:23  makro
+// no message
+//
 // Revision 1.71  2004/01/26 21:26:08  makro
 // no message
 //
@@ -2491,10 +2494,12 @@ void SetFuncStaticState(gentity_t *ent, qboolean state)
 		ent->s.eFlags &= ~EF_NODRAW;
 		ent->r.contents = CONTENTS_SOLID;
 		ent->r.svFlags &= ~SVF_NOCLIENT;
+		trap_RQ3AdjustAreaPortalState(ent, qtrue, __LINE__, __FILE__);
 	} else {
 		ent->s.eFlags |= EF_NODRAW;
 		ent->r.contents = CONTENTS_TRIGGER;
 		ent->r.svFlags |= SVF_NOCLIENT;
+		trap_RQ3AdjustAreaPortalState(ent, qfalse, __LINE__, __FILE__);
 	}
 }
 
diff --git a/reaction/game/game.dsp b/reaction/game/game.dsp
index 89d27b61..88ff7bed 100644
--- a/reaction/game/game.dsp
+++ b/reaction/game/game.dsp
@@ -38,8 +38,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir "."
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "c:\reactionoutput"
-# PROP Intermediate_Dir "c:\reactionoutput"
+# PROP Output_Dir "D:\Work\rq3source\reaction\Release"
+# PROP Intermediate_Dir "D:\Work\rq3source\reaction\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir "."
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /map /machine:I386 /out:"..\Release/qagamex86.dll"
+# ADD LINK32 kernel32.lib user32.lib winmm.lib /nologo /base:"0x20000000" /subsystem:windows /dll /map /machine:I386 /out:"D:\Work\rq3source\reaction\Release\qagamex86.dll"
 # SUBTRACT LINK32 /incremental:yes /debug
 
 !ELSEIF  "$(CFG)" == "game - Win32 Debug"
diff --git a/reaction/game/game.plg b/reaction/game/game.plg
index 61ace79f..9b32128f 100644
--- a/reaction/game/game.plg
+++ b/reaction/game/game.plg
@@ -3,410 +3,118 @@
 <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\RSP8BF.tmp" with contents
-[
-/nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FR"Release/" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"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\RSP8BF.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8C0.tmp" with contents
-[
-/nologo /base:"0x30000000" /subsystem:windows /dll /incremental:no /pdb:"Release/cgamex86.pdb" /map:"Release/cgamex86.map" /machine:I386 /def:".\cgame.def" /out:"../Release/cgamex86.dll" /implib:"Release/cgamex86.lib" 
-.\Release\bg_misc.obj
-.\Release\bg_pmove.obj
-.\Release\bg_slidemove.obj
-.\Release\cg_atmospheric.obj
-.\Release\cg_consolecmds.obj
-.\Release\cg_draw.obj
-.\Release\cg_drawtools.obj
-.\Release\cg_effects.obj
-.\Release\cg_ents.obj
-.\Release\cg_event.obj
-.\Release\cg_info.obj
-.\Release\cg_localents.obj
-.\Release\cg_main.obj
-.\Release\cg_marks.obj
-.\Release\cg_players.obj
-.\Release\cg_playerstate.obj
-.\Release\cg_predict.obj
-.\Release\cg_scoreboard.obj
-.\Release\cg_servercmds.obj
-.\Release\cg_snapshot.obj
-.\Release\cg_syscalls.obj
-.\Release\cg_unlagged.obj
-.\Release\cg_view.obj
-.\Release\cg_weapons.obj
-.\Release\q_math.obj
-.\Release\q_shared.obj
-.\Release\ui_shared.obj
-]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8C0.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 Release/cgamex86.lib and object Release/cgamex86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8C4.tmp" with contents
-[
-/nologo /o"Release/cgame.bsc" 
-.\Release\bg_misc.sbr
-.\Release\bg_pmove.sbr
-.\Release\bg_slidemove.sbr
-.\Release\cg_atmospheric.sbr
-.\Release\cg_consolecmds.sbr
-.\Release\cg_draw.sbr
-.\Release\cg_drawtools.sbr
-.\Release\cg_effects.sbr
-.\Release\cg_ents.sbr
-.\Release\cg_event.sbr
-.\Release\cg_info.sbr
-.\Release\cg_localents.sbr
-.\Release\cg_main.sbr
-.\Release\cg_marks.sbr
-.\Release\cg_players.sbr
-.\Release\cg_playerstate.sbr
-.\Release\cg_predict.sbr
-.\Release\cg_scoreboard.sbr
-.\Release\cg_servercmds.sbr
-.\Release\cg_snapshot.sbr
-.\Release\cg_syscalls.sbr
-.\Release\cg_unlagged.sbr
-.\Release\cg_view.sbr
-.\Release\cg_weapons.sbr
-.\Release\q_math.sbr
-.\Release\q_shared.sbr
-.\Release\ui_shared.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8C4.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\RSP8C5.tmp" with contents
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E0.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 
-"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"
+/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\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\RSP8C5.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8C6.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E0.tmp" 
+Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E1.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" 
-c:\reactionoutput\ai_chat.obj
-c:\reactionoutput\ai_cmd.obj
-c:\reactionoutput\ai_dmnet.obj
-c:\reactionoutput\ai_dmq3.obj
-c:\reactionoutput\ai_main.obj
-c:\reactionoutput\ai_team.obj
-c:\reactionoutput\ai_vcmd.obj
-c:\reactionoutput\bg_misc.obj
-c:\reactionoutput\bg_pmove.obj
-c:\reactionoutput\bg_slidemove.obj
-c:\reactionoutput\g_active.obj
-c:\reactionoutput\g_arenas.obj
-c:\reactionoutput\g_bot.obj
-c:\reactionoutput\g_client.obj
-c:\reactionoutput\g_cmds.obj
-c:\reactionoutput\g_combat.obj
-c:\reactionoutput\g_fileio.obj
-c:\reactionoutput\g_items.obj
-c:\reactionoutput\g_main.obj
-c:\reactionoutput\g_matchmode.obj
-c:\reactionoutput\g_mem.obj
-c:\reactionoutput\g_misc.obj
-c:\reactionoutput\g_missile.obj
-c:\reactionoutput\g_mover.obj
-c:\reactionoutput\g_session.obj
-c:\reactionoutput\g_spawn.obj
-c:\reactionoutput\g_svcmds.obj
-c:\reactionoutput\g_syscalls.obj
-c:\reactionoutput\g_target.obj
-c:\reactionoutput\g_team.obj
-c:\reactionoutput\g_teamplay.obj
-c:\reactionoutput\g_trigger.obj
-c:\reactionoutput\g_unlagged.obj
-c:\reactionoutput\g_utils.obj
-c:\reactionoutput\g_weapon.obj
-c:\reactionoutput\q_math.obj
-c:\reactionoutput\q_shared.obj
-c:\reactionoutput\rxn_game.obj
-c:\reactionoutput\zcam.obj
-c:\reactionoutput\zcam_target.obj
+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
+\Work\rq3source\reaction\Release\ai_cmd.obj
+\Work\rq3source\reaction\Release\ai_dmnet.obj
+\Work\rq3source\reaction\Release\ai_dmq3.obj
+\Work\rq3source\reaction\Release\ai_main.obj
+\Work\rq3source\reaction\Release\ai_team.obj
+\Work\rq3source\reaction\Release\ai_vcmd.obj
+\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\g_active.obj
+\Work\rq3source\reaction\Release\g_arenas.obj
+\Work\rq3source\reaction\Release\g_bot.obj
+\Work\rq3source\reaction\Release\g_client.obj
+\Work\rq3source\reaction\Release\g_cmds.obj
+\Work\rq3source\reaction\Release\g_combat.obj
+\Work\rq3source\reaction\Release\g_fileio.obj
+\Work\rq3source\reaction\Release\g_items.obj
+\Work\rq3source\reaction\Release\g_main.obj
+\Work\rq3source\reaction\Release\g_matchmode.obj
+\Work\rq3source\reaction\Release\g_mem.obj
+\Work\rq3source\reaction\Release\g_misc.obj
+\Work\rq3source\reaction\Release\g_missile.obj
+\Work\rq3source\reaction\Release\g_mover.obj
+\Work\rq3source\reaction\Release\g_session.obj
+\Work\rq3source\reaction\Release\g_spawn.obj
+\Work\rq3source\reaction\Release\g_svcmds.obj
+\Work\rq3source\reaction\Release\g_syscalls.obj
+\Work\rq3source\reaction\Release\g_target.obj
+\Work\rq3source\reaction\Release\g_team.obj
+\Work\rq3source\reaction\Release\g_teamplay.obj
+\Work\rq3source\reaction\Release\g_trigger.obj
+\Work\rq3source\reaction\Release\g_unlagged.obj
+\Work\rq3source\reaction\Release\g_utils.obj
+\Work\rq3source\reaction\Release\g_weapon.obj
+\Work\rq3source\reaction\Release\q_math.obj
+\Work\rq3source\reaction\Release\q_shared.obj
+\Work\rq3source\reaction\Release\rxn_game.obj
+\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\RSP8C6.tmp"
+Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2E1.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 c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8CA.tmp" with contents
+   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\RSP2E5.tmp" with contents
 [
-/nologo /o"c:\reactionoutput/game.bsc" 
-c:\reactionoutput\ai_chat.sbr
-c:\reactionoutput\ai_cmd.sbr
-c:\reactionoutput\ai_dmnet.sbr
-c:\reactionoutput\ai_dmq3.sbr
-c:\reactionoutput\ai_main.sbr
-c:\reactionoutput\ai_team.sbr
-c:\reactionoutput\ai_vcmd.sbr
-c:\reactionoutput\bg_misc.sbr
-c:\reactionoutput\bg_pmove.sbr
-c:\reactionoutput\bg_slidemove.sbr
-c:\reactionoutput\g_active.sbr
-c:\reactionoutput\g_arenas.sbr
-c:\reactionoutput\g_bot.sbr
-c:\reactionoutput\g_client.sbr
-c:\reactionoutput\g_cmds.sbr
-c:\reactionoutput\g_combat.sbr
-c:\reactionoutput\g_fileio.sbr
-c:\reactionoutput\g_items.sbr
-c:\reactionoutput\g_main.sbr
-c:\reactionoutput\g_matchmode.sbr
-c:\reactionoutput\g_mem.sbr
-c:\reactionoutput\g_misc.sbr
-c:\reactionoutput\g_missile.sbr
-c:\reactionoutput\g_mover.sbr
-c:\reactionoutput\g_session.sbr
-c:\reactionoutput\g_spawn.sbr
-c:\reactionoutput\g_svcmds.sbr
-c:\reactionoutput\g_syscalls.sbr
-c:\reactionoutput\g_target.sbr
-c:\reactionoutput\g_team.sbr
-c:\reactionoutput\g_teamplay.sbr
-c:\reactionoutput\g_trigger.sbr
-c:\reactionoutput\g_unlagged.sbr
-c:\reactionoutput\g_utils.sbr
-c:\reactionoutput\g_weapon.sbr
-c:\reactionoutput\q_math.sbr
-c:\reactionoutput\q_shared.sbr
-c:\reactionoutput\rxn_game.sbr
-c:\reactionoutput\zcam.sbr
-c:\reactionoutput\zcam_target.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8CA.tmp"
+/nologo /o"D:\Work\rq3source\reaction\Release/game.bsc" 
+\Work\rq3source\reaction\Release\ai_chat.sbr
+\Work\rq3source\reaction\Release\ai_cmd.sbr
+\Work\rq3source\reaction\Release\ai_dmnet.sbr
+\Work\rq3source\reaction\Release\ai_dmq3.sbr
+\Work\rq3source\reaction\Release\ai_main.sbr
+\Work\rq3source\reaction\Release\ai_team.sbr
+\Work\rq3source\reaction\Release\ai_vcmd.sbr
+\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\g_active.sbr
+\Work\rq3source\reaction\Release\g_arenas.sbr
+\Work\rq3source\reaction\Release\g_bot.sbr
+\Work\rq3source\reaction\Release\g_client.sbr
+\Work\rq3source\reaction\Release\g_cmds.sbr
+\Work\rq3source\reaction\Release\g_combat.sbr
+\Work\rq3source\reaction\Release\g_fileio.sbr
+\Work\rq3source\reaction\Release\g_items.sbr
+\Work\rq3source\reaction\Release\g_main.sbr
+\Work\rq3source\reaction\Release\g_matchmode.sbr
+\Work\rq3source\reaction\Release\g_mem.sbr
+\Work\rq3source\reaction\Release\g_misc.sbr
+\Work\rq3source\reaction\Release\g_missile.sbr
+\Work\rq3source\reaction\Release\g_mover.sbr
+\Work\rq3source\reaction\Release\g_session.sbr
+\Work\rq3source\reaction\Release\g_spawn.sbr
+\Work\rq3source\reaction\Release\g_svcmds.sbr
+\Work\rq3source\reaction\Release\g_syscalls.sbr
+\Work\rq3source\reaction\Release\g_target.sbr
+\Work\rq3source\reaction\Release\g_team.sbr
+\Work\rq3source\reaction\Release\g_teamplay.sbr
+\Work\rq3source\reaction\Release\g_trigger.sbr
+\Work\rq3source\reaction\Release\g_unlagged.sbr
+\Work\rq3source\reaction\Release\g_utils.sbr
+\Work\rq3source\reaction\Release\g_weapon.sbr
+\Work\rq3source\reaction\Release\q_math.sbr
+\Work\rq3source\reaction\Release\q_shared.sbr
+\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\RSP2E5.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\RSP8CB.tmp" with contents
-[
-/nologo /G6 /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /FR"Release_TA/" /Fp"Release_TA/ta_ui.pch" /YX /Fo"Release_TA/" /Fd"Release_TA/" /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\RSP8CB.tmp" 
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8CC.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:"../Release/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
-]
-Creating command line "link.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8CC.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 Release_TA/uix86.lib and object Release_TA/uix86.exp
-Creating temporary file "C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8D0.tmp" with contents
-[
-/nologo /o"Release_TA/ta_ui.bsc" 
-.\Release_TA\bg_misc.sbr
-.\Release_TA\q_math.sbr
-.\Release_TA\q_shared.sbr
-.\Release_TA\ui_atoms.sbr
-.\Release_TA\ui_gameinfo.sbr
-.\Release_TA\ui_main.sbr
-.\Release_TA\ui_players.sbr
-.\Release_TA\ui_shared.sbr
-.\Release_TA\ui_syscalls.sbr
-.\Release_TA\ui_util.sbr]
-Creating command line "bscmake.exe @C:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8D0.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>
diff --git a/reaction/ta_ui/ta_ui.dsp b/reaction/ta_ui/ta_ui.dsp
index 0d52bdcb..552cfbe1 100644
--- a/reaction/ta_ui/ta_ui.dsp
+++ b/reaction/ta_ui/ta_ui.dsp
@@ -39,8 +39,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release_TA"
-# PROP Intermediate_Dir "Release_TA"
+# PROP Output_Dir "D:\Work\rq3source\reaction\Release"
+# PROP Intermediate_Dir "D:\Work\rq3source\reaction\Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /G6 /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /YX /FD /c
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 /nologo /base:"0x40000000" /dll /map /machine:I386 /out:"../Release/uix86.dll"
-# ADD LINK32 /nologo /base:"0x40000000" /dll /map /machine:I386 /out:"../Release/uix86.dll"
+# ADD LINK32 /nologo /base:"0x40000000" /dll /map /machine:I386 /out:"D:\Work\rq3source\reaction\Release\uix86.dll"
 
 !ELSEIF  "$(CFG)" == "ui - Win32 Debug TA"
 
diff --git a/reaction/uifiles/setup.menu b/reaction/uifiles/setup.menu
index d4273291..5e1c0883 100644
--- a/reaction/uifiles/setup.menu
+++ b/reaction/uifiles/setup.menu
@@ -276,7 +276,6 @@
 	decoration
     }
 
-/*
 //Replacements
 
     itemdef {
@@ -317,7 +316,6 @@
 	visible 0
 	decoration
     }
-*/
 
 //Reset to defaults
 
@@ -326,7 +324,7 @@
 	group "topmenu"
 	type 1
 	background "menu/art/rq3-setup-defaults"
-	rect 528 12 32 32
+	rect 576 12 32 32
 	style WINDOW_STYLE_SHADER
 	visible 1
 	onFocus { show default_focus ; timefade default_focus forecolor 1 1 1 1 0 250 ;
@@ -339,7 +337,7 @@
 	name default_focus
 	background "menu/art/rq3-menu-focus"
 	forecolor 1 1 1 0
-	rect 528 12 32 32
+	rect 576 12 32 32
 	style WINDOW_STYLE_SHADER
 	visible 0
 	decoration