diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index e402c83c..50340c68 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.135 2003/02/16 21:39:09 makro
+// Fixed "timelimit is read only" on local servers error
+//
// Revision 1.134 2003/02/05 20:21:38 jbravo
// Fixed the model replacement system. Its no longer an ugly hack.
//
@@ -1854,10 +1857,11 @@ extern vmCvar_t ui_RQ3_teamCount2;
extern vmCvar_t ui_RQ3_numSpectators;
// JBravo: MM ingame menu cvars.
-extern vmCvar_t cg_RQ3_timelimit;
+//Makro - removed timelimit/fraglimit cvars - they were causing problems on local servers
+//extern vmCvar_t cg_RQ3_timelimit;
extern vmCvar_t cg_RQ3_roundlimit;
extern vmCvar_t cg_RQ3_roundtimelimit;
-extern vmCvar_t cg_RQ3_fraglimit;
+//extern vmCvar_t cg_RQ3_fraglimit;
extern vmCvar_t cg_RQ3_maxplayers;
extern vmCvar_t cg_RQ3_forceteamtalk;
extern vmCvar_t cg_RQ3_limchasecam;
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index aa9a69dd..56bc0ffa 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
+// Revision 1.120 2003/02/16 21:39:09 makro
+// Fixed "timelimit is read only" on local servers error
+//
// Revision 1.119 2003/02/05 20:21:38 jbravo
// Fixed the model replacement system. Its no longer an ugly hack.
//
@@ -588,10 +591,11 @@ vmCvar_t cg_enableLaserFog;
vmCvar_t cg_enableDust;
// JBravo: cvars for the MM ingame menu
-vmCvar_t cg_RQ3_timelimit;
+//Makro - removed timelimit/fraglimit cvars - they were causing problems on local servers
+//vmCvar_t cg_RQ3_timelimit;
vmCvar_t cg_RQ3_roundlimit;
vmCvar_t cg_RQ3_roundtimelimit;
-vmCvar_t cg_RQ3_fraglimit;
+//vmCvar_t cg_RQ3_fraglimit;
vmCvar_t cg_RQ3_maxplayers;
vmCvar_t cg_RQ3_forceteamtalk;
vmCvar_t cg_RQ3_limchasecam;
@@ -818,10 +822,11 @@ static cvarTable_t cvarTable[] = { // bk001129
//Slicer: Team Status Cvars for MM
{&cg_RQ3_matchmode, "g_RQ3_matchmode", "0", 0},
// JBravo: more MM ingame cvars.
- {&cg_RQ3_timelimit, "timelimit", "0", CVAR_ROM},
+ //Makro - removed timelimit/fraglimit cvars - they were causing problems on local servers
+ //{&cg_RQ3_timelimit, "cg_RQ#timelimit", "0", CVAR_ROM},
{&cg_RQ3_roundlimit, "cg_RQ3_roundlimit", "0", CVAR_ROM},
{&cg_RQ3_roundtimelimit, "cg_RQ3_roundtimelimit", "0", CVAR_ROM},
- {&cg_RQ3_fraglimit, "fraglimit", "0", CVAR_ROM},
+ //{&cg_RQ3_fraglimit, "fraglimit", "0", CVAR_ROM},
{&cg_RQ3_maxplayers, "cg_RQ3_maxplayers", "0", CVAR_ROM},
{&cg_RQ3_forceteamtalk, "cg_RQ3_forceteamtalk", "0", CVAR_ROM},
{&cg_RQ3_limchasecam, "cg_RQ3_limchasecam", "0", CVAR_ROM},
diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg
index 1724a64f..39d26daf 100644
--- a/reaction/cgame/cgame.plg
+++ b/reaction/cgame/cgame.plg
@@ -6,101 +6,112 @@
--------------------Configuration: cgame - Win32 Release--------------------
Command Lines
-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"
-"C:\Games\Quake3\rq3source\reaction\game\bg_pmove.c"
-"C:\Games\Quake3\rq3source\reaction\game\bg_slidemove.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_consolecmds.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_draw.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_drawtools.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_effects.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_ents.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_event.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_info.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_localents.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_main.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_marks.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_players.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_playerstate.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_predict.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_scoreboard.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_servercmds.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_snapshot.c"
-"C:\Games\Quake3\rq3source\reaction\cgame\cg_syscalls.c"
-"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\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
-.\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_view.obj
-.\Release\cg_weapons.obj
-.\Release\q_math.obj
-.\Release\q_shared.obj
-.\Release\ui_shared.obj
-]
-Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP127.tmp"
-Output Window
-Compiling...
-bg_misc.c
-bg_pmove.c
-bg_slidemove.c
-cg_atmospheric.c
-cg_consolecmds.c
-C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c(626) : warning C4706: assignment within conditional expression
-C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c(638) : warning C4706: assignment within conditional expression
-C:\Games\Quake3\rq3source\reaction\cgame\cg_atmospheric.c(184) : warning C4701: local variable 'tr' may be used without having been initialized
-C:\Games\Quake3\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
-cg_servercmds.c
-cg_snapshot.c
-cg_syscalls.c
-cg_view.c
-cg_weapons.c
-Linking...
- Creating library Release/cgamex86.lib and object Release/cgamex86.exp
Results
-cgamex86.dll - 0 error(s), 4 warning(s)
+cgamex86.dll - 0 error(s), 0 warning(s)
+
+--------------------Configuration: game - Win32 Release--------------------
+
+Command Lines
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP78.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\g_matchmode.c"
+"C:\Games\Quake3\rq3source\reaction\game\g_misc.c"
+]
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP78.tmp"
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP79.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\RSP79.tmp"
+Output Window
+Compiling...
+g_matchmode.c
+g_misc.c
+Linking...
+ Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
+
+
+
+Results
+qagamex86.dll - 0 error(s), 0 warning(s)
+
+--------------------Configuration: ui - Win32 Release TA--------------------
+
+Command Lines
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP7D.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\ta_ui\ui_main.c"
+]
+Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP7D.tmp"
+Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP7E.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\RSP7E.tmp"
+Output Window
+Compiling...
+ui_main.c
+Linking...
+ Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
+
+
+
+Results
+uix86.dll - 0 error(s), 0 warning(s)