From cffc4a2ca1a419450871d61c8475b13460373b7d Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Tue, 10 Sep 2002 14:18:23 +0000
Subject: [PATCH] no message

---
 reaction/ChangeLog                            | 15 +++----
 reaction/game/g_main.c                        |  7 +++-
 reaction/ta_ui/ta_ui.plg                      | 39 ++++++++++++-------
 .../uifiles/ingame_matchmode_referee.menu     |  2 +-
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/reaction/ChangeLog b/reaction/ChangeLog
index c23b8aab..3ca03591 100644
--- a/reaction/ChangeLog
+++ b/reaction/ChangeLog
@@ -1,19 +1,20 @@
 # List fixes here for the 2.25 release
 
 * Problem fixed in the bullet firing code that affected the otherwise good hitboxes.
-* Sky portal code tweaked for better performance. Now it's also possible to have sky portals with animated textures
-* Fixed "unselectable grenade shown in the inventory if you switch weapons after pulling the pin" bug
-* Fixed a bug that prevented headless player models from being rendered
-* Fixed the bug that was causing the in-game server info menu to spam an invalid shader error to the console
-* Added a scaling CTB respawn delay which is active when g_RQ3_ctb_respawndelay is 0
+* Sky portal code tweaked for better performance. Now it's also possible to have sky portals with animated textures.
+* Fixed "unselectable grenade shown in the inventory if you switch weapons after pulling the pin" bug.
+* Fixed a bug that prevented headless player models from being rendered.
+* Fixed the bug that was causing the in-game server info menu to spam an invalid shader error to the console.
+* Added a scaling CTB respawn delay which is active when g_RQ3_ctb_respawndelay is 0.
 * Fixed a bug where players could get past the teamspawns in CTB by using the team command.
-* Dropped cases stay on the map for 45 seconds now. (was 30 seconds)
-* SSG accuracy bug fixed. (It actually affects all weapons, just not noticably)
+* Dropped cases stay on the map for 45 seconds now. (was 30 seconds).
+* SSG accuracy bug fixed. (It actually affects all weapons, just not noticably).
 * cg_tracerchance now can be adjusted. Anything above 0.4 is capped internally. For fo0d, basically.
 * Fixed semi-auto pistol w/ predictweapons set to 0 bug. Also made predictweapons predict less when set to 0 (even more like Quake 2).
 * Bug with in-game server browser fixed that caused most RQ3 servers to be filtered out.
 * "Drop case" added.
 * Smoke puff on silencer less intrusive.
+* Fixed a bug that was filtering out maps from the callvote map lists.
 
 # List fixes here for the 2.2 release
 
diff --git a/reaction/game/g_main.c b/reaction/game/g_main.c
index 1c261ca4..b6628d1f 100644
--- a/reaction/game/g_main.c
+++ b/reaction/game/g_main.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.118  2002/09/10 14:14:20  makro
+// no message
+//
 // Revision 1.117  2002/09/09 02:30:12  niceass
 // updated version
 //
@@ -531,8 +534,8 @@ static cvarTable_t gameCvarTable[] = {
 	{&g_podiumDist, "g_podiumDist", "80", 0, 0, qfalse},
 	{&g_podiumDrop, "g_podiumDrop", "70", 0, 0, qfalse},
 
-	//Makro - changed default to 0
-	{&g_allowVote, "g_allowVote", "0", CVAR_ARCHIVE | CVAR_SYSTEMINFO, 0, qfalse},
+	//Makro - changed default to 0; added CVAR_SERVERINFO flag
+	{&g_allowVote, "g_allowVote", "0", CVAR_ARCHIVE | CVAR_SYSTEMINFO | CVAR_SERVERINFO, 0, qfalse},
 	{&g_listEntity, "g_listEntity", "0", 0, 0, qfalse},
 
 	// NiceAss: Taken out of the missionpack
diff --git a/reaction/ta_ui/ta_ui.plg b/reaction/ta_ui/ta_ui.plg
index 22f8a991..23d9f4a5 100644
--- a/reaction/ta_ui/ta_ui.plg
+++ b/reaction/ta_ui/ta_ui.plg
@@ -3,25 +3,38 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
+--------------------Configuration: cgame - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+cgamex86.dll - 0 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: game - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+qagamex86.dll - 0 error(s), 0 warning(s)
+<h3>
 --------------------Configuration: ui - Win32 Release TA--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP463.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP48E.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\game\bg_misc.c"
-"C:\Games\Quake3\rq3source\reaction\game\q_math.c"
-"C:\Games\Quake3\rq3source\reaction\game\q_shared.c"
 "C:\Games\Quake3\rq3source\reaction\ta_ui\ui_atoms.c"
 "C:\Games\Quake3\rq3source\reaction\ta_ui\ui_gameinfo.c"
 "C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c"
 "C:\Games\Quake3\rq3source\reaction\ta_ui\ui_players.c"
-"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_shared.c"
 "C:\Games\Quake3\rq3source\reaction\ta_ui\ui_syscalls.c"
-"C:\Games\Quake3\rq3source\reaction\ta_ui\ui_util.c"
 ]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP463.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP464.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP48E.tmp" 
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP48F.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
@@ -35,26 +48,22 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP464.tmp" with conte
 .\Release_TA\ui_syscalls.obj
 .\Release_TA\ui_util.obj
 ]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP464.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP48F.tmp"
 <h3>Output Window</h3>
 Compiling...
-bg_misc.c
-q_math.c
-q_shared.c
 ui_atoms.c
 ui_gameinfo.c
 ui_main.c
+C:\Games\Quake3\rq3source\reaction\ta_ui\ui_main.c(4821) : warning C4101: 'game' : unreferenced local variable
 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
 
 
 
 <h3>Results</h3>
-uix86.dll - 0 error(s), 0 warning(s)
+uix86.dll - 0 error(s), 1 warning(s)
 </pre>
 </body>
 </html>
diff --git a/reaction/uifiles/ingame_matchmode_referee.menu b/reaction/uifiles/ingame_matchmode_referee.menu
index 7767314f..b98a8d73 100644
--- a/reaction/uifiles/ingame_matchmode_referee.menu
+++ b/reaction/uifiles/ingame_matchmode_referee.menu
@@ -12,7 +12,7 @@
 	style WINDOW_STYLE_EMPTY
 	shadowStyle 1
 	border 0
-	onOpen { uiScript loadArenas ; hide grpReferee ; show login }
+	onOpen { uiScript loadVoteArenas ; hide grpReferee ; show login }
 
 //Window