rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-11 15:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Loading screen again

Browse source
This commit is contained in:
Andrei Drexler 2002-05-26 06:17:27 +00:00
parent 2c2b777545
commit 5488ab5aae
2 changed files with 24 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
reaction/cgame/cg_info.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.22 2002/05/26 06:17:27 makro
// Loading screen again
//
// Revision 1.21 2002/05/26 05:15:16 niceass // Revision 1.21 2002/05/26 05:15:16 niceass
// pregress bar // pregress bar
// //
@ -182,7 +185,6 @@ Draw all the status / pacifier stuff during level loading
#define LS_CHAR_WIDTH 8 #define LS_CHAR_WIDTH 8
#define LS_CHAR_HEIGHT 12 #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;
@ -191,6 +193,7 @@ void CG_DrawInformation( void ) {
int x = 8, y, value, bar = 0; int x = 8, y, value, bar = 0;
qhandle_t levelshot, shadow; qhandle_t levelshot, shadow;
//qhandle_t detail; //qhandle_t detail;
qhandle_t percentBox;
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};
@ -216,6 +219,7 @@ void CG_DrawInformation( void ) {
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");
levelshot = trap_R_RegisterShaderNoMip( va( "levelshots/%s.tga", s ) ); levelshot = trap_R_RegisterShaderNoMip( va( "levelshots/%s.tga", s ) );
percentBox = trap_R_RegisterShaderNoMip("gfx/percent.tga");
if ( !levelshot ) { if ( !levelshot ) {
//Elder: changed //Elder: changed
levelshot = trap_R_RegisterShaderNoMip( "levelshots/rq3-unknownmap.tga" ); levelshot = trap_R_RegisterShaderNoMip( "levelshots/rq3-unknownmap.tga" );
@ -399,14 +403,27 @@ void CG_DrawInformation( void ) {
//UI_DrawProportionalString(SCREEN_WIDTH - 8, y, "AWAITING SNAPSHOT...", UI_RIGHT, colorWhite); //UI_DrawProportionalString(SCREEN_WIDTH - 8, y, "AWAITING SNAPSHOT...", UI_RIGHT, colorWhite);
} }
y += 24; //y += 24;
for (bar = 0; bar < ceil(cg.loadingMapPercent * 10); bar++) { if (percentBox) {
CG_FillRect( SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, colorWhite); trap_R_SetColor(colorWhite);
for (bar = 0; bar < ceil(cg.loadingMapPercent * 10) && bar < 10; bar++) {
CG_DrawPic(SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, percentBox);
}
trap_R_SetColor(colorDkGrey);
for (bar; bar < 10; bar++) {
CG_DrawPic(SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, percentBox);
}
} else {
for (bar = 0; bar < ceil(cg.loadingMapPercent * 10) && bar < 10; bar++) {
CG_FillRect( SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, colorWhite);
}
for (bar; bar < 10; bar++) {
CG_FillRect( SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, colorDkGrey);
}
} }
for (bar; bar < 10; bar++) {
CG_FillRect( SCREEN_WIDTH - (11 - bar) * 10, y, 8, 8, colorDkGrey);
}
} }

41
reaction/cgame/cgame.plg
View file

@ -6,47 +6,6 @@
--------------------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\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"
]
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
.\Release\bg_pmove.obj
.\Release\bg_slidemove.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\RSP2A9.tmp"
<h3>Output Window</h3>
Compiling...
cg_info.c
Linking...
Creating library Release/cgamex86.lib and object Release/cgamex86.exp