From 8362dc262f14bb322a409e611885ef6df42faeb5 Mon Sep 17 00:00:00 2001
From: Andrei Drexler <makro@rq3.com>
Date: Sat, 9 Nov 2002 14:13:32 +0000
Subject: [PATCH] Added tdmMode info to the loading screen

---
 reaction/cgame/cg_event.c |   7 +-
 reaction/cgame/cg_info.c  |   8 +-
 reaction/cgame/cgame.plg  | 191 +-------------------------------------
 3 files changed, 15 insertions(+), 191 deletions(-)

diff --git a/reaction/cgame/cg_event.c b/reaction/cgame/cg_event.c
index d12fba74..3836ca0b 100644
--- a/reaction/cgame/cg_event.c
+++ b/reaction/cgame/cg_event.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.70  2002/11/09 14:13:32  makro
+// Added tdmMode info to the loading screen
+//
 // Revision 1.69  2002/10/30 20:04:33  jbravo
 // Adding helmet
 //
@@ -193,8 +196,8 @@ CG_UseItem
 */
 static void CG_UseItem(centity_t * cent)
 {
-	clientInfo_t *ci;
-	int itemNum, clientNum;
+	//clientInfo_t *ci;
+	int itemNum;
 	gitem_t *item;
 	entityState_t *es;
 
diff --git a/reaction/cgame/cg_info.c b/reaction/cgame/cg_info.c
index b9600024..30445395 100644
--- a/reaction/cgame/cg_info.c
+++ b/reaction/cgame/cg_info.c
@@ -5,6 +5,9 @@
 //-----------------------------------------------------------------------------
 //
 // $Log$
+// Revision 1.37  2002/11/09 14:13:32  makro
+// Added tdmMode info to the loading screen
+//
 // Revision 1.36  2002/08/29 04:42:40  blaze
 // Anti OGC code
 //
@@ -332,8 +335,9 @@ void CG_DrawInformation(void)
 	case GT_TOURNAMENT:
 		line = "TOURNAMENT";
 		break;
+	//Makro - added tdmMode
 	case GT_TEAM:
-		line = "TEAM DEATHMATCH";
+		line = (atoi(Info_ValueForKey(info, "g_RQ3_tdmMode")) != 0) ? "TEAM DEATHMATCH (CLASSIC)" : "TEAM DEATHMATCH (TP-STYLE)";
 		break;
 // JBravo: teamplay stuff.
 	case GT_TEAMPLAY:
@@ -365,7 +369,7 @@ void CG_DrawInformation(void)
 		line = va("%s / MATCHMODE", line);
 	s = Info_ValueForKey(sysInfo, "sv_pure");
 	if (atoi(s) == 0)
-		line = va("%s / SV_PURE DISABLED", line);
+		line = va("%s / SV_PURE OFF", line);
 	//Makro - custom color; changed from colorWhite
 	//CG_DrawSmallStringColor(x, y, line, color2);
 	CG_DrawStringExt(x, y, line, color2, qfalse, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg
index b6745013..1724a64f 100644
--- a/reaction/cgame/cgame.plg
+++ b/reaction/cgame/cgame.plg
@@ -6,7 +6,7 @@
 --------------------Configuration: cgame - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP143.tmp" with contents
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP126.tmp" with contents
 [
 /nologo /G6 /ML /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"Release/cgame.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c 
 "C:\Games\Quake3\rq3source\reaction\game\bg_misc.c"
@@ -33,8 +33,8 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP143.tmp" with conte
 "C:\Games\Quake3\rq3source\reaction\cgame\cg_view.c"
 "C:\Games\Quake3\rq3source\reaction\cgame\cg_weapons.c"
 ]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP143.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP144.tmp" with contents
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP126.tmp" 
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP127.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
@@ -64,7 +64,7 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP144.tmp" with conte
 .\Release\q_shared.obj
 .\Release\ui_shared.obj
 ]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP144.tmp"
+Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP127.tmp"
 <h3>Output Window</h3>
 Compiling...
 bg_misc.c
@@ -101,189 +101,6 @@ Linking...
 
 <h3>Results</h3>
 cgamex86.dll - 0 error(s), 4 warning(s)
-<h3>
---------------------Configuration: game - Win32 Release--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP148.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\bg_misc.c"
-"C:\Games\Quake3\rq3source\reaction\game\bg_pmove.c"
-"C:\Games\Quake3\rq3source\reaction\game\bg_slidemove.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\RSP148.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP149.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
-\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\RSP149.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
-C:\Games\Quake3\rq3source\reaction\game\g_client.c(1687) : warning C4701: local variable 'classname' may be used without having been initialized
-g_combat.c
-g_fileio.c
-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(2127) : 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.exp
-
-
-
-<h3>Results</h3>
-qagamex86.dll - 0 error(s), 2 warning(s)
-<h3>
---------------------Configuration: ui - Win32 Release TA--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP14D.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\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_syscalls.c"
-]
-Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP14D.tmp" 
-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP14E.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 @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP14E.tmp"
-<h3>Output Window</h3>
-Compiling...
-bg_misc.c
-ui_atoms.c
-ui_gameinfo.c
-ui_main.c
-ui_players.c
-ui_syscalls.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)
 </pre>
 </body>
 </html>