From 42928c4a67a6adffdd07cc1c44f8e2492bef24b6 Mon Sep 17 00:00:00 2001 From: Andrei Drexler Date: Thu, 2 May 2002 23:04:59 +0000 Subject: [PATCH] Loading screen. Jump kicks --- reaction/cgame/cg_event.c | 6 ++++-- reaction/cgame/cg_info.c | 43 +++++++++++++++++++++++---------------- reaction/cgame/cgame.plg | 8 ++++---- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/reaction/cgame/cg_event.c b/reaction/cgame/cg_event.c index be010e24..646b1863 100644 --- a/reaction/cgame/cg_event.c +++ b/reaction/cgame/cg_event.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.53 2002/05/02 23:04:59 makro +// Loading screen. Jump kicks +// // Revision 1.52 2002/04/29 06:14:57 niceass // pressure // @@ -1492,8 +1495,7 @@ static void CG_JumpKick ( entityState_t *ent ) } // everyone hears this - // Makro - I didn't ! Changed from CHAN_AUTO - trap_S_StartSound(NULL, ent->number, CHAN_BODY, cgs.media.kickSound); + trap_S_StartSound(NULL, ent->number, CHAN_AUTO, cgs.media.kickSound); } /* diff --git a/reaction/cgame/cg_info.c b/reaction/cgame/cg_info.c index 25662f82..4ee365c0 100644 --- a/reaction/cgame/cg_info.c +++ b/reaction/cgame/cg_info.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.16 2002/05/02 23:04:59 makro +// Loading screen. Jump kicks +// // Revision 1.15 2002/05/02 12:44:07 makro // Customizable color for the loading screen text // @@ -170,13 +173,24 @@ void CG_DrawInformation( void ) { qhandle_t detail; char buf[1024]; qboolean skipdetail; - vec4_t color = {1, 1, 1, 1}; + vec4_t color1 = {.75, .75, .75, 1}, color2 = {1, 1, 1, 1}; skipdetail = qfalse; info = CG_ConfigString( CS_SERVERINFO ); sysInfo = CG_ConfigString( CS_SYSTEMINFO ); + //Makro - settings read from the worldspawn entity + s = CG_ConfigString( CS_LOADINGSCREEN ); + color1[0] = atof(Info_ValueForKey(s, "r1")); + color1[1] = atof(Info_ValueForKey(s, "g1")); + color1[2] = atof(Info_ValueForKey(s, "b1")); + color2[0] = atof(Info_ValueForKey(s, "r2")); + color2[1] = atof(Info_ValueForKey(s, "g2")); + color2[2] = atof(Info_ValueForKey(s, "b2")); + color1[3] = color2[3] = 1; + skipdetail = ( atoi(Info_ValueForKey(s, "nodetail")) != 0 ); + s = Info_ValueForKey( info, "mapname" ); shadow = trap_R_RegisterShaderNoMip("ui/assets/rq3-main-shadow-1.tga"); levelshot = trap_R_RegisterShaderNoMip( va( "levelshots/%s.tga", s ) ); @@ -239,20 +253,13 @@ void CG_DrawInformation( void ) { //Q_strncpyz(buf, s, 1024); //Q_CleanStr(buf); - //Makro - allow color-coded texts + //Makro - allow color-coded texts; also changed to use custom color instead of colorLtGrey //CG_DrawSmallStringColor(x, y, s, colorMdGrey); - CG_DrawStringExt(x, y, s, colorLtGrey, qfalse, qfalse, SMALLCHAR_WIDTH, SMALLCHAR_HEIGHT, 0); + CG_DrawStringExt(x, y, s, color1, qfalse, qfalse, SMALLCHAR_WIDTH, SMALLCHAR_HEIGHT, 0); y += SMALLCHAR_HEIGHT; } - //Makro - get the text color - s = CG_ConfigString( CS_LOADINGSCREEN ); - color[0] = atof(Info_ValueForKey(s, "red")); - color[1] = atof(Info_ValueForKey(s, "green")); - color[2] = atof(Info_ValueForKey(s, "blue")); - color[3] = 1; - // don't print server lines if playing a local game trap_Cvar_VariableStringBuffer( "sv_running", buf, sizeof( buf ) ); if ( !atoi( buf ) ) { @@ -263,7 +270,7 @@ void CG_DrawInformation( void ) { //UI_DrawProportionalString( x, y, buf, //UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite ); //Makro - custom color; changed from colorWhite - CG_DrawSmallStringColor(x, y, buf, color); + CG_DrawSmallStringColor(x, y, buf, color2); y += SMALLCHAR_HEIGHT; // pure server @@ -272,7 +279,7 @@ void CG_DrawInformation( void ) { //UI_DrawProportionalString( 4, y, "Pure Server", //UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite ); //Makro - custom color; changed from colorWhite - CG_DrawSmallStringColor(x, y, "PURE SERVER", color); + CG_DrawSmallStringColor(x, y, "PURE SERVER", color2); y += SMALLCHAR_HEIGHT; } @@ -280,7 +287,7 @@ void CG_DrawInformation( void ) { s = CG_ConfigString( CS_MOTD ); if ( s[0] ) { //Makro - custom color; changed from colorWhite - UI_DrawProportionalString( x, 360, s, UI_LEFT|UI_SMALLFONT, color ); + UI_DrawProportionalString( x, 360, s, UI_LEFT|UI_SMALLFONT, color2 ); y += PROP_HEIGHT; } @@ -294,7 +301,7 @@ void CG_DrawInformation( void ) { //UI_DrawProportionalString( x, y, "CHEATS ARE ENABLED", //UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite ); //Makro - custom color; changed from colorWhite - CG_DrawSmallStringColor(x, y, "CHEATS ARE ENABLED", color); + CG_DrawSmallStringColor(x, y, "CHEATS ARE ENABLED", color2); y += SMALLCHAR_HEIGHT; } @@ -339,7 +346,7 @@ void CG_DrawInformation( void ) { //UI_DrawProportionalString( x, y, s, //UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite ); //Makro - custom color; changed from colorWhite - CG_DrawSmallStringColor(x, y, s, color); + CG_DrawSmallStringColor(x, y, s, color2); y += SMALLCHAR_HEIGHT; value = atoi( Info_ValueForKey( info, "timelimit" ) ); @@ -347,7 +354,7 @@ void CG_DrawInformation( void ) { //UI_DrawProportionalString( x, y, va( "timelimit %i", value ), //UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite ); //Makro - custom color; changed from colorWhite - CG_DrawSmallStringColor(x, y, va( "TIMELIMIT %i", value ), color); + CG_DrawSmallStringColor(x, y, va( "TIMELIMIT %i", value ), color2); y += SMALLCHAR_HEIGHT; } @@ -357,7 +364,7 @@ void CG_DrawInformation( void ) { //UI_DrawProportionalString( x, y, va( "fraglimit %i", value ), //UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite ); //Makro - custom color; changed from colorWhite - CG_DrawSmallStringColor(x, y, va( "FRAGLIMIT %i", value ), color); + CG_DrawSmallStringColor(x, y, va( "FRAGLIMIT %i", value ), color2); y += SMALLCHAR_HEIGHT; } } @@ -368,7 +375,7 @@ void CG_DrawInformation( void ) { //UI_DrawProportionalString( x, y, va( "capturelimit %i", value ), //UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite ); //Makro - custom color; changed from colorWhite - CG_DrawSmallStringColor(x, y, va( "CAPTURELIMIT %i", value ), color); + CG_DrawSmallStringColor(x, y, va( "CAPTURELIMIT %i", value ), color2); y += SMALLCHAR_HEIGHT; } } diff --git a/reaction/cgame/cgame.plg b/reaction/cgame/cgame.plg index 53e0decd..6064b403 100644 --- a/reaction/cgame/cgame.plg +++ b/reaction/cgame/cgame.plg @@ -6,7 +6,7 @@ --------------------Configuration: cgame - Win32 Release--------------------

Command Lines

-Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1613.tmp" with contents +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1EF2.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" @@ -35,8 +35,8 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1613.tmp" with cont "C:\Games\Quake3\rq3source\reaction\game\q_shared.c" "C:\Games\Quake3\rq3source\reaction\ui\ui_shared.c" ] -Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1613.tmp" -Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1614.tmp" with contents +Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1EF2.tmp" +Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1EF3.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 @@ -65,7 +65,7 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1614.tmp" with cont .\Release\q_shared.obj .\Release\ui_shared.obj ] -Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1614.tmp" +Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1EF3.tmp"

Output Window

Compiling... bg_misc.c