More MM...

This commit is contained in:
Andrei Drexler 2002-06-28 21:20:44 +00:00
parent cafc045df3
commit 81d662f02c
2 changed files with 47 additions and 36 deletions

View file

@ -3,35 +3,43 @@
<pre>
<h1>Build Log</h1>
<h3>
--------------------Configuration: ui - Win32 Debug TA--------------------
--------------------Configuration: ui - Win32 Release TA--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP62.tmp" with contents
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP94.tmp" with contents
[
/nologo /G5 /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "UI_EXPORTS" /FR"Debug_TA/" /Fp"Debug_TA/ta_ui.pch" /YX /Fo"Debug_TA/" /Fd"Debug_TA/" /FD /GZ /c
/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_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\RSP62.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP63.tmp" with contents
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP94.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP95.tmp" with contents
[
/nologo /base:"0x40000000" /dll /incremental:yes /pdb:"../Debug/ui.pdb" /map:"Debug_TA/uix86.map" /debug /machine:I386 /def:".\ui.def" /out:"uix86.dll" /implib:"Debug_TA/uix86.lib" /pdbtype:sept
.\Debug_TA\bg_misc.obj
.\Debug_TA\q_math.obj
.\Debug_TA\q_shared.obj
.\Debug_TA\ui_atoms.obj
.\Debug_TA\ui_gameinfo.obj
.\Debug_TA\ui_main.obj
.\Debug_TA\ui_players.obj
.\Debug_TA\ui_shared.obj
.\Debug_TA\ui_syscalls.obj
.\Debug_TA\ui_util.obj
/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\RSP63.tmp"
Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP95.tmp"
<h3>Output Window</h3>
Compiling...
ui_atoms.c
ui_gameinfo.c
ui_main.c
ui_players.c
ui_syscalls.c
Linking...
Creating library Debug_TA/uix86.lib and object Debug_TA/uix86.exp
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp

View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.39 2002/06/28 21:20:44 makro
// More MM...
//
// Revision 1.38 2002/06/28 20:30:35 makro
// MM
//
@ -3902,15 +3905,15 @@ static void UI_RunMenuScript(char **args)
ui_RQ3_friendlyFire.integer));
//Makro - sync ui MM cvars with the real ones
} else if (Q_stricmp(name, "readMMsettings") == 0) {
ui_RQ3_timelimit.integer = (int) trap_Cvar_VariableValue("timelimit");
ui_RQ3_roundlimit.integer = (int) trap_Cvar_VariableValue("g_RQ3_roundlimit");
ui_RQ3_roundtimelimit.integer = (int) trap_Cvar_VariableValue("g_RQ3_roundtimelimit");
ui_RQ3_fraglimit.integer = (int) trap_Cvar_VariableValue("fraglimit");
ui_RQ3_maxplayers.integer = (int) trap_Cvar_VariableValue("g_RQ3_maxplayers");
ui_RQ3_forceteamtalk.integer = (int) trap_Cvar_VariableValue("g_RQ3_forceteamtalk");
ui_RQ3_limchasecam.integer = (int) trap_Cvar_VariableValue("g_RQ3_limchasecam");
ui_RQ3_tgren.integer = (int) trap_Cvar_VariableValue("g_RQ3_tgren");
ui_RQ3_friendlyFire.integer = (int) trap_Cvar_VariableValue("g_friendlyFire");
trap_Cvar_SetValue("ui_RQ3_timelimit", trap_Cvar_VariableValue("timelimit"));
trap_Cvar_SetValue("ui_RQ3_roundlimit", trap_Cvar_VariableValue("g_RQ3_roundlimit"));
trap_Cvar_SetValue("ui_RQ3_roundtimelimit", trap_Cvar_VariableValue("g_RQ3_roundtimelimit"));
trap_Cvar_SetValue("ui_RQ3_fraglimit", trap_Cvar_VariableValue("fraglimit"));
trap_Cvar_SetValue("ui_RQ3_maxplayers", trap_Cvar_VariableValue("g_RQ3_maxplayers"));
trap_Cvar_SetValue("ui_RQ3_forceteamtalk", trap_Cvar_VariableValue("g_RQ3_forceteamtalk"));
trap_Cvar_SetValue("ui_RQ3_limchasecam", trap_Cvar_VariableValue("g_RQ3_limchasecam"));
trap_Cvar_SetValue("ui_RQ3_tgren", trap_Cvar_VariableValue("g_RQ3_tgren"));
trap_Cvar_SetValue("ui_RQ3_friendlyFire", trap_Cvar_VariableValue("g_friendlyFire"));
//Makro - change the SSG crosshair
} else if (Q_stricmp(name, "nextSSGCrosshair") == 0) {
int current, offset;
@ -6813,15 +6816,15 @@ static cvarTable_t cvarTable[] = {
//Makro - demo name
{&ui_RQ3_demoName, "ui_RQ3_demoName", "", 0},
//Makro - matchmode settings
{&ui_RQ3_timelimit, "timelimit", "0", 0},
{&ui_RQ3_roundlimit, "g_RQ3_roundlimit", "0", 0},
{&ui_RQ3_roundtimelimit, "g_RQ3_roundtimelimit", "0", 0},
{&ui_RQ3_fraglimit, "fraglimit", "0", 0},
{&ui_RQ3_maxplayers, "g_RQ3_maxplayers", "0", 0},
{&ui_RQ3_forceteamtalk, "g_RQ3_forceteamtalk", "0", 0},
{&ui_RQ3_limchasecam, "g_RQ3_limchasecam", "0", 0},
{&ui_RQ3_tgren, "g_RQ3_tgren", "0", 0},
{&ui_RQ3_friendlyFire, "g_friendlyFire", "0", 0}
{&ui_RQ3_timelimit, "ui_RQ3_timelimit", "0", 0},
{&ui_RQ3_roundlimit, "ui_RQ3_roundlimit", "0", 0},
{&ui_RQ3_roundtimelimit, "ui_RQ3_roundtimelimit", "0", 0},
{&ui_RQ3_fraglimit, "ui_RQ3_fraglimit", "0", 0},
{&ui_RQ3_maxplayers, "ui_RQ3_maxplayers", "0", 0},
{&ui_RQ3_forceteamtalk, "ui_RQ3_forceteamtalk", "0", 0},
{&ui_RQ3_limchasecam, "ui_RQ3_limchasecam", "0", 0},
{&ui_RQ3_tgren, "ui_RQ3_tgren", "0", 0},
{&ui_RQ3_friendlyFire, "ui_RQ3_friendlyFire", "0", 0}
};
// bk001129 - made static to avoid aliasing