q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-22 03:51:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed interface bug with overlapping icons

Browse source
This commit is contained in:
q3rally 2021-04-25 20:46:11 +00:00
parent 7df4038c2f
commit 7dcf020d87
6 changed files with 54 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
engine/code/cgame/cg_draw.c
View file

@ -760,7 +760,8 @@ static void CG_DrawRallyStatusBar( void ) {
// armor background // armor background
if ( ps->stats[ STAT_ARMOR ] ) if ( ps->stats[ STAT_ARMOR ] )
CG_FillRect( 190, 476 - 68, 106, 32, bg_color ); // CG_FillRect( 190, 476 - 68, 106, 32, bg_color );
CG_FillRect( 370, 476 - 32, 106, 32, bg_color );
// health background // health background
CG_FillRect( 190, 476 - 32, 106, 32, bg_color ); CG_FillRect( 190, 476 - 32, 106, 32, bg_color );
@ -823,7 +824,8 @@ static void CG_DrawRallyStatusBar( void ) {
origin[1] = 0; origin[1] = 0;
origin[2] = -10; origin[2] = -10;
angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0; angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0;
CG_Draw3DModel( 196, 476 - 64, 26, 26, // CG_Draw3DModel( 196, 476 - 64, 26, 26,
CG_Draw3DModel( 376, 476 - 28, 26, 26,
cgs.media.armorModel, 0, origin, angles ); cgs.media.armorModel, 0, origin, angles );
} }
@ -938,7 +940,8 @@ static void CG_DrawRallyStatusBar( void ) {
value = ps->stats[STAT_ARMOR]; value = ps->stats[STAT_ARMOR];
if (value > 0 ) { if (value > 0 ) {
trap_R_SetColor( colors[0] ); trap_R_SetColor( colors[0] );
CG_DrawField ( 242, 476 - 64, 3, value); // CG_DrawField ( 242, 476 - 64, 3, value);
CG_DrawField ( 422, 476 - 28, 3, value);
trap_R_SetColor( NULL ); trap_R_SetColor( NULL );
// if we didn't draw a 3D icon, draw a 2D icon for armor // if we didn't draw a 3D icon, draw a 2D icon for armor
if ( !cg_draw3dIcons.integer && cg_drawIcons.integer ) { if ( !cg_draw3dIcons.integer && cg_drawIcons.integer ) {

2
engine/code/cgame/cg_local.h
View file

@ -1952,7 +1952,7 @@ float CG_DrawUpperRightHUD( float y );
float CG_DrawLowerRightHUD( float y ); float CG_DrawLowerRightHUD( float y );
float CG_DrawLowerLeftHUD( float y ); float CG_DrawLowerLeftHUD( float y );
void CG_DrawMMap( float x, float y, float w, float h ); void CG_DrawMMap( float x, float y, float w, float h );
void CG_DrawHUD_DerbyList(float x, float y); // void CG_DrawHUD_DerbyList(float x, float y);
// //

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

@ -354,8 +354,12 @@ static float CG_DrawArrowToCheckpoint( float y ) {
} }
trap_R_SetColor( color ); trap_R_SetColor( color );
// if (cg_developer.integer) /* Developer Mode for Racing Bots
// CG_Draw3DLine( cent->currentState.origin, cg.snap->ps.origin );
if (cg_developer.integer)
CG_Draw3DLine( cent->currentState.origin, cg.snap->ps.origin );
*/
CG_DrawStringExt( x, SCREEN_HEIGHT * .30, "WRONG WAY!", color, qfalse, qtrue, CG_DrawStringExt( x, SCREEN_HEIGHT * .30, "WRONG WAY!", color, qfalse, qtrue,
BIGCHAR_WIDTH, (int)(BIGCHAR_WIDTH * 1.5), 0 ); BIGCHAR_WIDTH, (int)(BIGCHAR_WIDTH * 1.5), 0 );
@ -812,6 +816,7 @@ static float CG_DrawSpeed( float y ) {
return y; return y;
} }
/*
static float CG_DrawSDKMessage( float y ) { static float CG_DrawSDKMessage( float y ) {
int x, w; int x, w;
vec4_t bg_color; vec4_t bg_color;
@ -859,7 +864,7 @@ static float CG_DrawSDKMessage( float y ) {
return y; return y;
} }
*/
#if 0 #if 0
/* /*
@ -912,7 +917,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 );
CG_DrawHUD_DerbyList(44, 130); // CG_DrawHUD_DerbyList(44, 130);
} }

1
engine/code/cgame/cg_weapons.c
View file

@ -718,6 +718,7 @@ void CG_RegisterWeapon( int weaponNum ) {
weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/flamer/fl_fire.wav", qfalse ); weaponInfo->flashSound[0] = trap_S_RegisterSound( "sound/weapons/flamer/fl_fire.wav", qfalse );
cgs.media.flameExplosionShader = trap_R_RegisterShader( "rocketExplosion" ); cgs.media.flameExplosionShader = trap_R_RegisterShader( "rocketExplosion" );
break; break;
// Q3Rally Code END // Q3Rally Code END
#ifdef MISSIONPACK #ifdef MISSIONPACK

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.0.3.0_r383" #define PRODUCT_VERSION "v0.0.3.0_r385"
#endif #endif

48
q3rallycode.ppr
View file

@ -95,7 +95,7 @@ q3rallycode
engine\code\botlib\l_utils.h engine\code\botlib\l_utils.h
engine\code\botlib\lcc.mak engine\code\botlib\lcc.mak
engine\code\botlib\linux-i386.mak engine\code\botlib\linux-i386.mak
-cgame +cgame
engine\code\cgame\cg_atmospheric.c engine\code\cgame\cg_atmospheric.c
engine\code\cgame\cg_consolecmds.c engine\code\cgame\cg_consolecmds.c
engine\code\cgame\cg_draw.c engine\code\cgame\cg_draw.c
@ -869,9 +869,14 @@ q3rallycode
8=engine\code\game\g_weapon.c 8=engine\code\game\g_weapon.c
9=engine\code\game\g_local.h 9=engine\code\game\g_local.h
10=engine\code\cgame\cg_weapons.c 10=engine\code\cgame\cg_weapons.c
11=engine\code\game\bg_misc.c
12=engine\code\game\bg_public.h
13=engine\code\game\g_items.c
14=engine\code\cgame\cg_effects.c
15=engine\code\cgame\cg_main.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\cgame\cg_weapons.c Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=53 TopLine=53
Caret=39,70 Caret=39,70
@ -882,20 +887,20 @@ Caret=1,2287
TopLine=477 TopLine=477
Caret=1,492 Caret=1,492
[engine\code\cgame\cg_ents.c] [engine\code\cgame\cg_ents.c]
TopLine=1390 TopLine=517
Caret=1,1405 Caret=1,532
[engine\code\cgame\cg_rally_hud.c] [engine\code\cgame\cg_rally_hud.c]
TopLine=931 TopLine=1
Caret=1,955 Caret=3,819
[engine\code\cgame\cg_rally_hud2.c] [engine\code\cgame\cg_rally_hud2.c]
TopLine=361 TopLine=1
Caret=19,361 Caret=126,75
[engine\code\cgame\cg_draw.c] [engine\code\cgame\cg_draw.c]
TopLine=1280 TopLine=930
Caret=1,1295 Caret=26,944
[engine\code\cgame\cg_local.h] [engine\code\cgame\cg_local.h]
TopLine=1885 TopLine=1940
Caret=1,1900 Caret=4,1955
[engine\code\game\g_weapon.c] [engine\code\game\g_weapon.c]
TopLine=128 TopLine=128
Caret=16,146 Caret=16,146
@ -903,5 +908,20 @@ Caret=16,146
TopLine=637 TopLine=637
Caret=1,652 Caret=1,652
[engine\code\cgame\cg_weapons.c] [engine\code\cgame\cg_weapons.c]
TopLine=701 TopLine=2011
Caret=64,716 Caret=32,2032
[engine\code\game\bg_misc.c]
TopLine=65
Caret=11,89
[engine\code\game\bg_public.h]
TopLine=808
Caret=1,823
[engine\code\game\g_items.c]
TopLine=486
Caret=1,501
[engine\code\cgame\cg_effects.c]
TopLine=612
Caret=1,627
[engine\code\cgame\cg_main.c]
TopLine=892
Caret=84,907