rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-22 19:51:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

better centerprint

Browse source
This commit is contained in:
Bryce Hutchings 2002-04-29 06:10:48 +00:00
parent f33b298f45
commit dd0869b671
1 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
reaction/cgame/cg_draw.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.37 2002/04/29 06:10:48 niceass
// better centerprint
//
// Revision 1.36 2002/04/29 01:24:34 niceass // Revision 1.36 2002/04/29 01:24:34 niceass
// frag counter added // frag counter added
// //
@ -990,17 +993,6 @@ static float CG_DrawScore ( float y ) {
int w, x; int w, x;
float Color[4]; float Color[4];
/*
if (cgs.gametype >= GT_TEAM) {
if (cg.snap->ps.persistant[PERS_SAVEDTEAM] == TEAM_RED)
MAKERGBA(Color, 1.0f, 0.0f, 0.0f, 0.4f);
if (cg.snap->ps.persistant[PERS_SAVEDTEAM] == TEAM_BLUE)
MAKERGBA(Color, 0.0f, 0.0f, 1.0f, 0.4f);
}
*/
y += 4; y += 4;
s = va( "%i", cg.snap->ps.persistant[PERS_SCORE] ); s = va( "%i", cg.snap->ps.persistant[PERS_SCORE] );
@ -2113,21 +2105,33 @@ for a few moments
*/ */
void CG_CenterPrint( const char *str, int y, int charWidth ) { void CG_CenterPrint( const char *str, int y, int charWidth ) {
char *s; char *s;
int length = 0;
Q_strncpyz( cg.centerPrint, str, sizeof(cg.centerPrint) ); Q_strncpyz( cg.centerPrint, str, sizeof(cg.centerPrint) );
cg.centerPrintTime = cg.time; cg.centerPrintTime = cg.time;
cg.centerPrintY = y; cg.centerPrintY = y;
cg.centerPrintCharWidth = charWidth; cg.centerPrintCharWidth = charWidth;
cg.centerPrintMaxLen = 0;
// count the number of lines for centering // count the number of lines for centering
cg.centerPrintLines = 1; cg.centerPrintLines = 1;
s = cg.centerPrint; s = cg.centerPrint;
while( *s ) { while( *s ) {
if (*s == '\n') if (*s == '\n') {
cg.centerPrintLines++; cg.centerPrintLines++;
if (length > cg.centerPrintMaxLen) cg.centerPrintMaxLen = length;
length = 0;
}
else {
length++;
}
s++; s++;
} }
if (cg.centerPrintMaxLen == 0) cg.centerPrintMaxLen = CG_DrawStrlen(str);
// Last character a linefeed
if (*(s - 1) == '\n') cg.centerPrintLines--;
} }
@ -2143,7 +2147,8 @@ static void CG_DrawCenterString( void ) {
#ifdef MISSIONPACK // bk010221 - unused else #ifdef MISSIONPACK // bk010221 - unused else
int h; int h;
#endif #endif
float *color; float *color, color2[4];
int windowHeight;
if ( !cg.centerPrintTime ) { if ( !cg.centerPrintTime ) {
return; return;
@ -2158,7 +2163,17 @@ static void CG_DrawCenterString( void ) {
start = cg.centerPrint; start = cg.centerPrint;
y = cg.centerPrintY - cg.centerPrintLines * BIGCHAR_HEIGHT / 2; windowHeight = cg.centerPrintLines*(int)(cg.centerPrintCharWidth * 1.5);
y = cg.centerPrintY - windowHeight / 2;
MAKERGBA(color2, 0.0f, 0.0f, 0.0f, 0.4f);
CG_FillRect(320 - (cg.centerPrintMaxLen*cg.centerPrintCharWidth)*0.5f - 3, y - 3,
cg.centerPrintCharWidth*cg.centerPrintMaxLen+6, windowHeight + 6, color2);
MAKERGBA(color2, 0.0f, 0.0f, 0.0f, 1.0f);
CG_DrawCleanRect(320 - (cg.centerPrintMaxLen*cg.centerPrintCharWidth)*0.5f - 3, y - 3,
cg.centerPrintCharWidth*cg.centerPrintMaxLen+6, windowHeight + 6, 1, color2);
while ( 1 ) { while ( 1 ) {
char linebuffer[1024]; char linebuffer[1024];