rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-01-22 17:41:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Loading screen

Browse source
This commit is contained in:
Andrei Drexler 2002-05-26 05:00:19 +00:00
parent e2c716f616
commit f669ac0726
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reaction/cgame/cg_info.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.20 2002/05/26 05:00:19 makro
// Loading screen
//
// Revision 1.19 2002/05/25 16:39:16 makro // Revision 1.19 2002/05/25 16:39:16 makro
// Loading screen // Loading screen
// //
@ -257,8 +260,8 @@ void CG_DrawInformation( void ) {
if ( s[0] ) { if ( s[0] ) {
//Makro - allow color-coded text; also changed to use custom color instead of colorLtGrey //Makro - allow color-coded text; also changed to use custom color instead of colorLtGrey
//CG_DrawSmallStringColor(x, y, s, colorMdGrey); //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, 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); y -= (2 * LS_CHAR_HEIGHT);
} }
@ -329,15 +332,19 @@ void CG_DrawInformation( void ) {
line = va("TIMELIMIT %i", value); line = va("TIMELIMIT %i", value);
} }
if (cgs.gametype < GT_CTF ) { if (cgs.gametype <= GT_TEAM ) {
value = atoi( Info_ValueForKey( info, "fraglimit" ) ); value = atoi( Info_ValueForKey( info, "fraglimit" ) );
if ( value ) { if ( value ) {
if (line[0]) line = va("%s / ", line); if (line[0]) line = va("%s / ", line);
line = va("%sFRAGLIMIT %i", line, value); line = va("%sFRAGLIMIT %i", line, value);
} }
} } else if (cgs.gametype == GT_TEAMPLAY) {
value = atoi( Info_ValueForKey( info, "g_RQ3_roundlimit" ) );
if (cgs.gametype >= GT_CTF) { if ( value ) {
if (line[0]) line = va("%s / ", line);
line = va("%sROUNDLIMIT %i", line, value);
}
} else {
value = atoi( Info_ValueForKey( info, "capturelimit" ) ); value = atoi( Info_ValueForKey( info, "capturelimit" ) );
if ( value ) { if ( value ) {
if (line[0]) line = va("%s / ", line); if (line[0]) line = va("%s / ", line);

16
reaction/cgame/cgame.plg
View file

@ -6,14 +6,13 @@
--------------------Configuration: cgame - Win32 Release-------------------- --------------------Configuration: cgame - Win32 Release--------------------
</h3> </h3>
<h3>Command Lines</h3> <h3>Command Lines</h3>
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 /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_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 command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP2A8.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP27F.tmp" with contents 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" /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_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\q_shared.obj
.\Release\ui_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"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
cg_info.c cg_info.c
cg_main.c Linking...
C:\Games\Quake3\rq3source\reaction\cgame\cg_main.c(1183) : error C2065: 'CS_BREAKABLES' : undeclared identifier Creating library Release/cgamex86.lib and object Release/cgamex86.exp
Error executing cl.exe.
<h3>Results</h3> <h3>Results</h3>
cgamex86.dll - 1 error(s), 0 warning(s) cgamex86.dll - 0 error(s), 0 warning(s)
</pre> </pre>
</body> </body>
</html> </html>