diff --git a/reaction/cgame/cg_info.c b/reaction/cgame/cg_info.c index 98643d11..ef39e2f1 100644 --- a/reaction/cgame/cg_info.c +++ b/reaction/cgame/cg_info.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.20 2002/05/26 05:00:19 makro +// Loading screen +// // Revision 1.19 2002/05/25 16:39:16 makro // Loading screen // @@ -257,8 +260,8 @@ void CG_DrawInformation( void ) { if ( s[0] ) { //Makro - allow color-coded text; also changed to use custom color instead of colorLtGrey //CG_DrawSmallStringColor(x, y, s, colorMdGrey); - CG_DrawStringExt(x, y, s, color1, qtrue, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0); //CG_DrawStringExt(x, y, s, colorWhite, qtrue, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0); + CG_DrawStringExt(x, y, s, color1, qtrue, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0); y -= (2 * LS_CHAR_HEIGHT); } @@ -329,15 +332,19 @@ void CG_DrawInformation( void ) { line = va("TIMELIMIT %i", value); } - if (cgs.gametype < GT_CTF ) { + if (cgs.gametype <= GT_TEAM ) { value = atoi( Info_ValueForKey( info, "fraglimit" ) ); if ( value ) { if (line[0]) line = va("%s / ", line); line = va("%sFRAGLIMIT %i", line, value); } - } - - if (cgs.gametype >= GT_CTF) { + } else if (cgs.gametype == GT_TEAMPLAY) { + value = atoi( Info_ValueForKey( info, "g_RQ3_roundlimit" ) ); + if ( value ) { + if (line[0]) line = va("%s / ", line); + line = va("%sROUNDLIMIT %i", line, value); + } + } else { value = atoi( Info_ValueForKey( info, "capturelimit" ) ); if ( value ) { if (line[0]) line = va("%s / ", line); diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg index 53428d19..40813f4d 100644 --- a/reaction/cgame/cgame.plg +++ b/reaction/cgame/cgame.plg @@ -6,14 +6,13 @@ --------------------Configuration: cgame - Win32 Release--------------------

Command Lines

-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP27E.tmp" with contents +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A8.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\cgame\cg_info.c" -"C:\Games\Quake3\rq3source\reaction\cgame\cg_main.c" ] -Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP27E.tmp" -Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP27F.tmp" with contents +Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A8.tmp" +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A9.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 @@ -42,18 +41,17 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP27F.tmp" with conte .\Release\q_shared.obj .\Release\ui_shared.obj ] -Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP27F.tmp" +Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A9.tmp"

Output Window

Compiling... cg_info.c -cg_main.c -C:\Games\Quake3\rq3source\reaction\cgame\cg_main.c(1183) : error C2065: 'CS_BREAKABLES' : undeclared identifier -Error executing cl.exe. +Linking... + Creating library Release/cgamex86.lib and object Release/cgamex86.exp

Results

-cgamex86.dll - 1 error(s), 0 warning(s) +cgamex86.dll - 0 error(s), 0 warning(s)