rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-23 04:32:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Loading screen

Browse source
This commit is contained in:
Andrei Drexler 2002-05-25 10:40:31 +00:00
parent bbf845b22a
commit 0d4c0752ae
8 changed files with 257 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

156
reaction/cgame/cg_info.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.18 2002/05/25 10:40:31 makro
// Loading screen
//
// Revision 1.17 2002/05/24 18:41:34 makro // Revision 1.17 2002/05/24 18:41:34 makro
// Loading screen // Loading screen
// //
@ -165,19 +168,22 @@ CG_DrawInformation
Draw all the status / pacifier stuff during level loading Draw all the status / pacifier stuff during level loading
==================== ====================
*/ */
#define LOADING_SCREEN_TOPMARGIN 64 #define LS_TOPMARGIN 72
#define LOADING_SCREEN_BOTTOMMARGIN 32 #define LS_BOTTOMMARGIN 48
#define LS_CHAR_WIDTH 8
#define LS_CHAR_HEIGHT 12
void CG_DrawInformation( void ) { void CG_DrawInformation( void ) {
const char *s; const char *s;
const char *info; const char *info;
const char *sysInfo; const char *sysInfo;
const char *line; char *line;
int x = 8; int x = 8;
int y; int y;
int value; int value;
qhandle_t levelshot, shadow; qhandle_t levelshot, shadow;
qhandle_t detail; //qhandle_t detail;
char buf[1024]; char buf[1024];
qboolean skipdetail; qboolean skipdetail;
vec4_t color1 = {.75, .75, .75, 1}, color2 = {1, 1, 1, 1}; vec4_t color1 = {.75, .75, .75, 1}, color2 = {1, 1, 1, 1};
@ -187,6 +193,7 @@ void CG_DrawInformation( void ) {
info = CG_ConfigString( CS_SERVERINFO ); info = CG_ConfigString( CS_SERVERINFO );
sysInfo = CG_ConfigString( CS_SYSTEMINFO ); sysInfo = CG_ConfigString( CS_SYSTEMINFO );
/* Makro - no longer used
//Makro - settings read from the worldspawn entity //Makro - settings read from the worldspawn entity
s = CG_ConfigString( CS_LOADINGSCREEN ); s = CG_ConfigString( CS_LOADINGSCREEN );
color1[0] = atof(Info_ValueForKey(s, "r1")); color1[0] = atof(Info_ValueForKey(s, "r1"));
@ -197,6 +204,7 @@ void CG_DrawInformation( void ) {
color2[2] = atof(Info_ValueForKey(s, "b2")); color2[2] = atof(Info_ValueForKey(s, "b2"));
color1[3] = color2[3] = 1; color1[3] = color2[3] = 1;
skipdetail = ( atoi(Info_ValueForKey(s, "nodetail")) != 0 ); skipdetail = ( atoi(Info_ValueForKey(s, "nodetail")) != 0 );
*/
s = Info_ValueForKey( info, "mapname" ); s = Info_ValueForKey( info, "mapname" );
shadow = trap_R_RegisterShaderNoMip("ui/assets/rq3-main-shadow-1.tga"); shadow = trap_R_RegisterShaderNoMip("ui/assets/rq3-main-shadow-1.tga");
@ -209,21 +217,23 @@ void CG_DrawInformation( void ) {
trap_R_SetColor( NULL ); trap_R_SetColor( NULL );
CG_DrawPic( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, levelshot ); CG_DrawPic( 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, levelshot );
/* Makro - removed
// blend a detail texture over it // blend a detail texture over it
//Elder: changed to RQ3 detail overlay //Elder: changed to RQ3 detail overlay
if (!skipdetail) { if (!skipdetail) {
detail = trap_R_RegisterShader( "rq3-levelShotDetail" ); detail = trap_R_RegisterShader( "rq3-levelShotDetail" );
trap_R_DrawStretchPic( 0, 0, cgs.glconfig.vidWidth, cgs.glconfig.vidHeight, 0, 0, 2.5, 2, detail ); trap_R_DrawStretchPic( 0, 0, cgs.glconfig.vidWidth, cgs.glconfig.vidHeight, 0, 0, 2.5, 2, detail );
} }
*/
//Elder: "Letterbox" mask //Elder: "Letterbox" mask
//Makro - changed it a bit //Makro - changed it a bit
CG_FillRect( 0, 0, SCREEN_WIDTH, LOADING_SCREEN_TOPMARGIN, colorBlack); CG_FillRect( 0, 0, SCREEN_WIDTH, LS_TOPMARGIN, colorBlack);
CG_FillRect( 0, LOADING_SCREEN_TOPMARGIN, SCREEN_WIDTH, 2, colorMdGrey); CG_FillRect( 0, LS_TOPMARGIN, SCREEN_WIDTH, 2, colorMdGrey);
CG_FillRect( 0, SCREEN_HEIGHT - LOADING_SCREEN_BOTTOMMARGIN, SCREEN_WIDTH, LOADING_SCREEN_BOTTOMMARGIN, colorBlack); CG_FillRect( 0, SCREEN_HEIGHT - LS_BOTTOMMARGIN, SCREEN_WIDTH, LS_BOTTOMMARGIN, colorBlack);
CG_FillRect( 0, SCREEN_HEIGHT - LOADING_SCREEN_BOTTOMMARGIN - 2, SCREEN_WIDTH, 2, colorMdGrey); CG_FillRect( 0, SCREEN_HEIGHT - LS_BOTTOMMARGIN - 2, SCREEN_WIDTH, 2, colorMdGrey);
//Makro - shadow //Makro - shadow
CG_DrawPic( 0, LOADING_SCREEN_TOPMARGIN + 2, 640, 12, shadow ); CG_DrawPic( 0, LS_TOPMARGIN + 2, 640, 12, shadow );
//Elder: mapname //Elder: mapname
//Makro - removed //Makro - removed
@ -234,65 +244,27 @@ void CG_DrawInformation( void ) {
// draw the icons of things as they are loaded // draw the icons of things as they are loaded
//CG_DrawLoadingIcons(); //CG_DrawLoadingIcons();
// the first 150 rows are reserved for the client connection
// screen to write into
y = SCREEN_HEIGHT - (int) (0.5 * (LOADING_SCREEN_BOTTOMMARGIN + SMALLCHAR_HEIGHT));
if ( cg.infoScreenText[0] ) {
CG_DrawSmallStringColor(x, y, va("LOADING... %s", Q_strupr(cg.infoScreenText)), colorWhite);
} else {
CG_DrawSmallStringColor( x, y, "AWAITING SNAPSHOT...", colorWhite);
}
// draw info string information // draw info string information
//Elder: Initial y-position //Elder: Initial y-position
y = 8; y = LS_TOPMARGIN - 8 - LS_CHAR_HEIGHT;
// map-specific message (long map name) // map-specific message (long map name)
s = CG_ConfigString( CS_MESSAGE ); s = CG_ConfigString( CS_MESSAGE );
if ( s[0] ) { if ( s[0] ) {
//Makro - allow color-coded texts; 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, qfalse, qfalse, SMALLCHAR_WIDTH, SMALLCHAR_HEIGHT, 0); CG_DrawStringExt(x, y, s, color1, qtrue, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
//CG_DrawStringExt(x, y, s, colorWhite, qtrue, qfalse, SMALLCHAR_WIDTH, SMALLCHAR_HEIGHT, 0); //CG_DrawStringExt(x, y, s, colorWhite, qtrue, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
y += SMALLCHAR_HEIGHT; y -= (2 * LS_CHAR_HEIGHT);
} }
// don't print server lines if playing a local game //y += LS_CHAR_HEIGHT;
trap_Cvar_VariableStringBuffer( "sv_running", buf, sizeof( buf ) );
if ( !atoi( buf ) ) {
// server hostname
Q_strncpyz(buf, Info_ValueForKey( info, "sv_hostname" ), 1024);
Q_CleanStr(buf);
//Makro - custom color; changed from colorWhite
CG_DrawSmallStringColor(x, y, buf, color2);
y += SMALLCHAR_HEIGHT;
// pure server
s = Info_ValueForKey( sysInfo, "sv_pure" );
if ( s[0] == '1' ) {
//Makro - custom color; changed from colorWhite
CG_DrawSmallStringColor(x, y, "PURE SERVER", color2);
y += SMALLCHAR_HEIGHT;
}
// server-specific message of the day
s = CG_ConfigString( CS_MOTD );
if ( s[0] ) {
//Makro - custom color; changed from colorWhite
UI_DrawProportionalString( x, 360, s, UI_LEFT|UI_SMALLFONT, color2 );
y += PROP_HEIGHT;
}
}
//y += SMALLCHAR_HEIGHT;
// game type // game type
switch ( cgs.gametype ) { switch ( cgs.gametype ) {
case GT_FFA: case GT_FFA:
line = "CLASSIC ACTION DEATHMATCH"; line = "Classic Action Deathmatch";
break; break;
case GT_SINGLE_PLAYER: case GT_SINGLE_PLAYER:
line = "Single Player"; line = "Single Player";
@ -306,7 +278,7 @@ void CG_DrawInformation( void ) {
// JBravo: teamplay stuff. // JBravo: teamplay stuff.
case GT_TEAMPLAY: case GT_TEAMPLAY:
//Makro - changed from RQ3 Teamplay //Makro - changed from RQ3 Teamplay
line = "CLASSIC ACTION TEAMPLAY"; line = "Classic Action Teamplay";
break; break;
case GT_CTF: case GT_CTF:
line = "Capture The Flag"; line = "Capture The Flag";
@ -326,17 +298,29 @@ void CG_DrawInformation( void ) {
line = "Unknown Gametype"; line = "Unknown Gametype";
break; break;
} }
line = Q_strupr(line);
// cheats warning // cheats warning
s = Info_ValueForKey( sysInfo, "sv_cheats" ); s = Info_ValueForKey( sysInfo, "sv_cheats" );
if ( s[0] == '1' ) { //Makro - didn't like this
//if ( s[0] == '1' ) {
if ( atoi(s) ) {
line = va("%s / CHEATS ARE ENABLED", line); line = va("%s / CHEATS ARE ENABLED", line);
} }
//Makro - custom color; changed from colorWhite //Makro - custom color; changed from colorWhite
CG_DrawSmallStringColor(x, y, line, color2); //CG_DrawSmallStringColor(x, y, line, color2);
y += SMALLCHAR_HEIGHT; CG_DrawStringExt(x, y, line, color2, qfalse, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
y -= LS_CHAR_HEIGHT;
line = ""; line = "";
// pure server
s = Info_ValueForKey( sysInfo, "sv_pure" );
if ( atoi(s) ) {
if (line[0]) line = va("%s / ", line);
line = va("%sPURE SERVER", line);
}
value = atoi( Info_ValueForKey( info, "timelimit" ) ); value = atoi( Info_ValueForKey( info, "timelimit" ) );
if ( value ) { if ( value ) {
line = va("TIMELIMIT %i", value); line = va("TIMELIMIT %i", value);
@ -345,22 +329,64 @@ void CG_DrawInformation( void ) {
if (cgs.gametype < GT_CTF ) { if (cgs.gametype < GT_CTF ) {
value = atoi( Info_ValueForKey( info, "fraglimit" ) ); value = atoi( Info_ValueForKey( info, "fraglimit" ) );
if ( value ) { if ( value ) {
if (line[0] != '\0') line = va("%s /", line); if (line[0]) line = va("%s / ", line);
line = va("%s FRAGLIMIT %i", line, value); line = va("%sFRAGLIMIT %i", line, value);
} }
} }
if (cgs.gametype >= GT_CTF) { if (cgs.gametype >= GT_CTF) {
value = atoi( Info_ValueForKey( info, "capturelimit" ) ); value = atoi( Info_ValueForKey( info, "capturelimit" ) );
if ( value ) { if ( value ) {
if (line[0] != '\0') line = va("%s /", line); if (line[0]) line = va("%s / ", line);
line = va("%s CAPTURELIMIT %i", line, value); line = va("%sCAPTURELIMIT %i", line, value);
} }
} }
//Makro - custom color; changed from colorWhite //Makro - don't write unless there's something to write
CG_DrawSmallStringColor(x, y, line, color2); if ( line[0] ) {
y += SMALLCHAR_HEIGHT; CG_DrawStringExt(x, y, line, color2, qfalse, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
y -= LS_CHAR_HEIGHT;
}
line = "";
// don't print server lines if playing a local game
trap_Cvar_VariableStringBuffer( "sv_running", buf, sizeof( buf ) );
if ( !atoi( buf ) ) {
// server hostname
Q_strncpyz(buf, Info_ValueForKey( info, "sv_hostname" ), 1024);
Q_CleanStr(buf);
if (buf[0] && Q_stricmp(buf, "noname")) {
line = va("%s", buf);
}
// server-specific message of the day
s = CG_ConfigString( CS_MOTD );
if ( s[0] ) {
if (line[0]) line = va("%s / ", line);
line = va("%s%s", line, s);
}
//Makro - don't write unless there's something to write
if ( line[0] )
CG_DrawStringExt(x, y, line, color2, qfalse, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
y -= LS_CHAR_HEIGHT;
}
// BOTTOM //
// the first 150 rows are reserved for the client connection
// screen to write into
//y = SCREEN_HEIGHT - (int) (0.5 * (LS_BOTTOMMARGIN + LS_CHAR_HEIGHT));
y = SCREEN_HEIGHT - LS_BOTTOMMARGIN + 8;
if ( cg.infoScreenText[0] ) {
CG_DrawStringExt(x, y, va("LOADING... %s", Q_strupr(cg.infoScreenText)), color2, qfalse, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
//UI_DrawProportionalString(SCREEN_WIDTH - 8, y, va("LOADING... %s", Q_strupr(cg.infoScreenText)), UI_RIGHT, colorWhite);
} else {
CG_DrawStringExt(x, y, "AWAITING SNAPSHOT...", color2, qfalse, qfalse, LS_CHAR_WIDTH, LS_CHAR_HEIGHT, 0);
//UI_DrawProportionalString(SCREEN_WIDTH - 8, y, "AWAITING SNAPSHOT...", UI_RIGHT, colorWhite);
}
//y += LS_CHAR_HEIGHT;
} }

8
reaction/cgame/cgame.plg
View file

@ -6,13 +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\RSP8B.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP262.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"
] ]
Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8B.tmp" Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP262.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8C.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP263.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
@ -41,7 +41,7 @@ Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP8C.tmp" with conten
.\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\RSP8C.tmp" Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP263.tmp"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
cg_info.c cg_info.c

5
reaction/game/bg_public.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.70 2002/05/25 10:40:31 makro
// Loading screen
//
// Revision 1.69 2002/05/23 03:07:10 blaze // Revision 1.69 2002/05/23 03:07:10 blaze
// Some changes to autoaction, still need to fix up a little bit more stuff relating to getting sent 2 screenshot requests // Some changes to autoaction, still need to fix up a little bit more stuff relating to getting sent 2 screenshot requests
// //
@ -467,7 +470,7 @@ extern radio_msg_t female_radio_msgs[];
#define CS_ITEMS 27 // string of 0's and 1's that tell which items are present #define CS_ITEMS 27 // string of 0's and 1's that tell which items are present
//Makro - color for the loading screen text //Makro - color for the loading screen text
#define CS_LOADINGSCREEN 29 //#define CS_LOADINGSCREEN 29
#define CS_MODELS 32 #define CS_MODELS 32
#define CS_SOUNDS (CS_MODELS+MAX_MODELS) #define CS_SOUNDS (CS_MODELS+MAX_MODELS)

11
reaction/game/g_spawn.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.27 2002/05/25 10:40:31 makro
// Loading screen
//
// Revision 1.26 2002/05/23 15:55:25 makro // Revision 1.26 2002/05/23 15:55:25 makro
// Elevators // Elevators
// //
@ -743,9 +746,9 @@ Every map should have exactly one worldspawn.
*/ */
void SP_worldspawn( void ) { void SP_worldspawn( void ) {
char *s; char *s;
vec3_t color; //vec3_t color;
char info[MAX_INFO_STRING]; //char info[MAX_INFO_STRING];
int nodetail = 0; //int nodetail = 0;
G_SpawnString( "classname", "", &s ); G_SpawnString( "classname", "", &s );
if ( Q_stricmp( s, "worldspawn" ) ) { if ( Q_stricmp( s, "worldspawn" ) ) {
@ -763,6 +766,7 @@ void SP_worldspawn( void ) {
G_SpawnString( "message", "", &s ); G_SpawnString( "message", "", &s );
trap_SetConfigstring( CS_MESSAGE, s ); // map specific message trap_SetConfigstring( CS_MESSAGE, s ); // map specific message
/* Makro - no longer
//Makro - color for the loading screen text //Makro - color for the loading screen text
G_SpawnVector( "_text_color", "0.75 0.75 0.75", color ); G_SpawnVector( "_text_color", "0.75 0.75 0.75", color );
Info_SetValueForKey(info, "r1", va("%f", color[0])); Info_SetValueForKey(info, "r1", va("%f", color[0]));
@ -777,6 +781,7 @@ void SP_worldspawn( void ) {
Info_SetValueForKey(info, "nodetail", va("%i", nodetail)); Info_SetValueForKey(info, "nodetail", va("%i", nodetail));
//save settings //save settings
trap_SetConfigstring( CS_LOADINGSCREEN, info ); trap_SetConfigstring( CS_LOADINGSCREEN, info );
*/
trap_SetConfigstring( CS_MOTD, g_motd.string ); // message of the day trap_SetConfigstring( CS_MOTD, g_motd.string ); // message of the day

19
reaction/game/g_weapon.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.61 2002/05/25 10:40:31 makro
// Loading screen
//
// Revision 1.60 2002/05/24 18:47:02 makro // Revision 1.60 2002/05/24 18:47:02 makro
// Jump kicks // Jump kicks
// //
@ -268,8 +271,7 @@ qboolean DoorKick( trace_t *trIn, gentity_t *ent, vec3_t origin, vec3_t forward
qboolean ok; qboolean ok;
traceEnt = &g_entities[ trIn->entityNum ]; traceEnt = &g_entities[ trIn->entityNum ];
if ( Q_stricmp (traceEnt->classname, "func_door_rotating") == 0 ) if ( Q_stricmp (traceEnt->classname, "func_door_rotating") == 0 ) {
{
vec3_t d_right, d_forward; vec3_t d_right, d_forward;
float crossProduct; float crossProduct;
vec3_t end; vec3_t end;
@ -288,26 +290,25 @@ qboolean DoorKick( trace_t *trIn, gentity_t *ent, vec3_t origin, vec3_t forward
if (traceEnt->moverState == ROTATOR_1TO2 || traceEnt->moverState == ROTATOR_POS2) { if (traceEnt->moverState == ROTATOR_1TO2 || traceEnt->moverState == ROTATOR_POS2) {
ok = !ok; ok = !ok;
} }
if ( ok && !(traceEnt->targetname) ) if ( ok && !traceEnt->targetname ) {
{
//Cmd_OpenDoor( ent ); //Cmd_OpenDoor( ent );
//Makro - Cmd_OpenDoor opens ALL the doors near the kicked one //Makro - Cmd_OpenDoor opens ALL the doors near the kicked one
Use_BinaryMover( traceEnt, traceEnt, ent); Use_BinaryMover( traceEnt, traceEnt, ent);
VectorMA( trIn->endpos, 25, forward, end ); VectorMA( trIn->endpos, 25, forward, end );
trap_Trace (&tr, trIn->endpos, NULL, NULL, end, trIn->entityNum, MASK_SHOT); trap_Trace (&tr, trIn->endpos, NULL, NULL, end, trIn->entityNum, MASK_SHOT);
if ( !(tr.surfaceFlags & SURF_NOIMPACT) ) if ( !(tr.surfaceFlags & SURF_NOIMPACT) ) {
{
traceEnt = &g_entities[ tr.entityNum ]; traceEnt = &g_entities[ tr.entityNum ];
if ( traceEnt->client ) if ( traceEnt->client )
{ {
*trIn = tr; *trIn = tr;
} }
} }
return qtrue;
} }
return qtrue;
} }
else
return qfalse; return qfalse;
} }

190
reaction/game/game.plg
View file

@ -3,74 +3,154 @@
<pre> <pre>
<h1>Build Log</h1> <h1>Build Log</h1>
<h3> <h3>
--------------------Configuration: game - 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\RSP94.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A7.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 /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\g_mover.c" "C:\Games\Quake3\rq3source\reaction\game\bg_misc.c"
"C:\Games\Quake3\rq3source\reaction\game\g_weapon.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_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\RSP94.tmp" Creating command line "cl.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A7.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP95.tmp" with contents Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A8.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" /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"
\reactionoutput\ai_chat.obj .\Release\bg_misc.obj
\reactionoutput\ai_cmd.obj .\Release\bg_pmove.obj
\reactionoutput\ai_dmnet.obj .\Release\bg_slidemove.obj
\reactionoutput\ai_dmq3.obj .\Release\cg_consolecmds.obj
\reactionoutput\ai_main.obj .\Release\cg_draw.obj
\reactionoutput\ai_team.obj .\Release\cg_drawtools.obj
\reactionoutput\ai_vcmd.obj .\Release\cg_effects.obj
\reactionoutput\bg_misc.obj .\Release\cg_ents.obj
\reactionoutput\bg_pmove.obj .\Release\cg_event.obj
\reactionoutput\bg_slidemove.obj .\Release\cg_info.obj
\reactionoutput\g_active.obj .\Release\cg_localents.obj
\reactionoutput\g_arenas.obj .\Release\cg_main.obj
\reactionoutput\g_bot.obj .\Release\cg_marks.obj
\reactionoutput\g_client.obj .\Release\cg_players.obj
\reactionoutput\g_cmds.obj .\Release\cg_playerstate.obj
\reactionoutput\g_combat.obj .\Release\cg_predict.obj
\reactionoutput\g_fileio.obj .\Release\cg_scoreboard.obj
\reactionoutput\g_items.obj .\Release\cg_servercmds.obj
\reactionoutput\g_main.obj .\Release\cg_snapshot.obj
\reactionoutput\g_matchmode.obj .\Release\cg_syscalls.obj
\reactionoutput\g_mem.obj .\Release\cg_view.obj
\reactionoutput\g_misc.obj .\Release\cg_weapons.obj
\reactionoutput\g_missile.obj .\Release\q_math.obj
\reactionoutput\g_mover.obj .\Release\q_shared.obj
\reactionoutput\g_session.obj .\Release\ui_shared.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\RSP95.tmp" Creating command line "link.exe @D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1A8.tmp"
<h3>Output Window</h3> <h3>Output Window</h3>
Compiling... Compiling...
g_mover.c bg_misc.c
g_weapon.c bg_pmove.c
C:\Games\Quake3\rq3source\reaction\game\g_weapon.c(2652) : warning C4701: local variable 'tr' may be used without having been initialized bg_slidemove.c
cg_consolecmds.c
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
C:\Games\Quake3\rq3source\reaction\cgame\cg_scoreboard.c(220) : warning C4101: 'RedSubs' : unreferenced local variable
C:\Games\Quake3\rq3source\reaction\cgame\cg_scoreboard.c(217) : warning C4101: 'subs' : unreferenced local variable
C:\Games\Quake3\rq3source\reaction\cgame\cg_scoreboard.c(220) : warning C4101: 'BlueSubs' : unreferenced local variable
cg_servercmds.c
cg_snapshot.c
cg_syscalls.c
cg_view.c
cg_weapons.c
Linking... Linking...
LINK : warning LNK4075: ignoring /EDITANDCONTINUE due to /INCREMENTAL:NO specification Creating library Release/cgamex86.lib and object Release/cgamex86.exp
Creating library c:\reactionoutput/qagamex86.lib and object c:\reactionoutput/qagamex86.exp
LINK : warning LNK4098: defaultlib "LIBC" conflicts with use of other libs; use /NODEFAULTLIB:library
<h3>Results</h3> <h3>Results</h3>
qagamex86.dll - 0 error(s), 3 warning(s) cgamex86.dll - 0 error(s), 3 warning(s)
<h3>
--------------------Configuration: game - Win32 Release--------------------
</h3>
<h3>Command Lines</h3>
<h3>Results</h3>
qagamex86.dll - 0 error(s), 0 warning(s)
<h3>
--------------------Configuration: ui - Win32 Release TA--------------------
</h3>
<h3>Command Lines</h3>
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1AC.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\game\bg_misc.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\RSP1AC.tmp"
Creating temporary file "D:\DOCUME~1\Andrei\LOCALS~1\Temp\RSP1AD.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\RSP1AD.tmp"
<h3>Output Window</h3>
Compiling...
bg_misc.c
ui_atoms.c
ui_gameinfo.c
ui_main.c
ui_players.c
ui_syscalls.c
Linking...
Creating library Release_TA/uix86.lib and object Release_TA/uix86.exp
<h3>Results</h3>
uix86.dll - 0 error(s), 0 warning(s)
</pre> </pre>
</body> </body>
</html> </html>

2
reaction/ta_ui/ta_ui.dsp
View file

@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 /nologo /base:"0x40000000" /dll /map /machine:I386 /out:"../Release/uix86.dll" # ADD BASE LINK32 /nologo /base:"0x40000000" /dll /map /machine:I386 /out:"../Release/uix86.dll"
# ADD LINK32 /nologo /base:"0x40000000" /dll /map /machine:I386 /out:"uix86.dll" # ADD LINK32 /nologo /base:"0x40000000" /dll /map /machine:I386 /out:"../Release/uix86.dll"
!ELSEIF "$(CFG)" == "ui - Win32 Debug TA" !ELSEIF "$(CFG)" == "ui - Win32 Debug TA"

4
reaction/ui/ui_players.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.5 2002/05/25 10:40:31 makro
// Loading screen
//
// Revision 1.4 2002/01/11 19:48:30 jbravo // Revision 1.4 2002/01/11 19:48:30 jbravo
// Formatted the source in non DOS format. // Formatted the source in non DOS format.
// //
@ -711,6 +714,7 @@ void UI_DrawPlayer( float x, float y, float w, float h, playerInfo_t *pi, int ti
pi->lastWeapon = pi->pendingWeapon; pi->lastWeapon = pi->pendingWeapon;
pi->pendingWeapon = -1; pi->pendingWeapon = -1;
pi->weaponTimer = 0; pi->weaponTimer = 0;
//Makro - do we want this sound ?
if( pi->currentWeapon != pi->weapon ) { if( pi->currentWeapon != pi->weapon ) {
trap_S_StartLocalSound( weaponChangeSound, CHAN_LOCAL ); trap_S_StartLocalSound( weaponChangeSound, CHAN_LOCAL );
} }