q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 21:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert widescreen changes

Browse source 
Reverted widescreen changes...
This commit is contained in:
P3rlE 2022-03-01 21:38:39 +01:00
parent f66bfc66c7
commit 3ec62383a8
3 changed files with 8 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
engine/code/cgame/cg_rally_hud.c
View file

@ -422,16 +422,9 @@ static float CG_DrawTimes( float y ) {
Com_sprintf(s, sizeof(s), "B: %s", time); Com_sprintf(s, sizeof(s), "B: %s", time);
// x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH; // x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
<<<<<<< HEAD
x = 636 - 80;
CG_FillRect ( x + cg_wideoffset.integer, y, 90, 18, bgColor );
x+= 10;
=======
x = 636 - 120; x = 636 - 120;
CG_FillRect ( x, y, 120, 18, bgColor ); CG_FillRect ( x, y, 120, 18, bgColor );
x+= 25; x+= 25;
>>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
y+= 4; y+= 4;
CG_DrawTinyDigitalStringColor( x, y, s, colorWhite); CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
y += TINYCHAR_HEIGHT + 4; y += TINYCHAR_HEIGHT + 4;
@ -448,16 +441,9 @@ static float CG_DrawTimes( float y ) {
Com_sprintf(s, sizeof(s), "L: %s", time); Com_sprintf(s, sizeof(s), "L: %s", time);
// x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH; // x = 600 - CG_DrawStrlen(s) * TINYCHAR_WIDTH;
<<<<<<< HEAD
x = 636 - 80;
CG_FillRect( x + cg_wideoffset.integer, y, 90, 18, bgColor );
x+= 10;
=======
x = 636 - 120; x = 636 - 120;
CG_FillRect( x, y, 120, 18, bgColor ); CG_FillRect( x, y, 120, 18, bgColor );
x+= 25; x+= 25;
>>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
y+= 4; y+= 4;
CG_DrawTinyDigitalStringColor( x, y, s, colorWhite); CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
y += TINYCHAR_HEIGHT + 4; y += TINYCHAR_HEIGHT + 4;
@ -481,16 +467,9 @@ static float CG_DrawTimes( float y ) {
Com_sprintf(s, sizeof(s), "T: %s", time); Com_sprintf(s, sizeof(s), "T: %s", time);
<<<<<<< HEAD
x = 636 - 80;
CG_FillRect( x + cg_wideoffset.integer, y, 90, 18, bgColor );
x += 10;
=======
x = 636 - 120; x = 636 - 120;
CG_FillRect( x, y, 120, 18, bgColor ); CG_FillRect( x, y, 120, 18, bgColor );
x += 25; x += 25;
>>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
y += 4; y += 4;
CG_DrawTinyDigitalStringColor( x, y, s, colorWhite); CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
y += TINYCHAR_HEIGHT + 4; y += TINYCHAR_HEIGHT + 4;
@ -522,16 +501,9 @@ static float CG_DrawLaps( float y ) {
Com_sprintf(s, sizeof(s), "LAP: %i/%i", curLap, numLaps); Com_sprintf(s, sizeof(s), "LAP: %i/%i", curLap, numLaps);
<<<<<<< HEAD
x = 636 - 80;
CG_FillRect( x + cg_wideoffset.integer, y, 90, 18, bgColor );
x += 10;
=======
x = 636 - 120; x = 636 - 120;
CG_FillRect( x, y, 120, 18, bgColor ); CG_FillRect( x, y, 120, 18, bgColor );
x += 25; x += 25;
>>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
y += 4; y += 4;
CG_DrawTinyDigitalStringColor( x, y, s, colorWhite); CG_DrawTinyDigitalStringColor( x, y, s, colorWhite);
y += TINYCHAR_HEIGHT + 4; y += TINYCHAR_HEIGHT + 4;
@ -573,15 +545,9 @@ static float CG_DrawCurrentPosition( float y ) {
x += TINYCHAR_WIDTH * 5; x += TINYCHAR_WIDTH * 5;
<<<<<<< HEAD
CG_DrawTinyDigitalStringColor( x + cg_wideoffset.integer, y, va("%i/%i", pos, cgs.numRacers), colorWhite);
y += 20;
=======
CG_DrawTinyDigitalStringColor( x, y, va("%i/%i", pos, cgs.numRacers), colorWhite); CG_DrawTinyDigitalStringColor( x, y, va("%i/%i", pos, cgs.numRacers), colorWhite);
y += 10 + 4; y += 10 + 4;
>>>>>>> parent of 9cf5988f (Widescreen Support(Danil_Dm))
return y; return y;
} }
@ -936,7 +902,7 @@ float CG_DrawUpperRightHUD( float y ) {
} }
else if (cgs.gametype == GT_DERBY) else if (cgs.gametype == GT_DERBY)
y = CG_DrawTimes( y ); y = CG_DrawTimes( y );
// 0.0.4.0 // 0.5
// CG_DrawHUD_DerbyList(44, 130); // CG_DrawHUD_DerbyList(44, 130);
} }

2
engine/code/qcommon/q_shared.h
View file

@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.4_r491" #define PRODUCT_VERSION "v0.4_r493"
#endif #endif

10
q3rallycode.ppr
View file

@ -894,7 +894,7 @@ q3rallycode
6=engine\code\cgame\cg_draw.c 6=engine\code\cgame\cg_draw.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\cgame\cg_draw.c Selected=engine\code\cgame\cg_rally_hud.c
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=58 TopLine=58
Caret=35,70 Caret=35,70
@ -908,11 +908,11 @@ Caret=77,440
TopLine=90 TopLine=90
Caret=79,106 Caret=79,106
[engine\code\cgame\cg_rally_hud.c] [engine\code\cgame\cg_rally_hud.c]
TopLine=931 TopLine=525
Caret=1,1 Caret=14,550
[engine\code\cgame\cg_rally_hud2.c] [engine\code\cgame\cg_rally_hud2.c]
TopLine=335 TopLine=378
Caret=33,422 Caret=33,422
[engine\code\cgame\cg_draw.c] [engine\code\cgame\cg_draw.c]
TopLine=1 TopLine=3052
Caret=3,3095 Caret=3,3095