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

some small HUD fixes / fixed flag position again

Browse source
This commit is contained in:
P3rlE 2022-03-11 23:55:03 +01:00
parent 304bccd5d8
commit 7bea27efcc
4 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/Makefile
View file

@ -111,7 +111,7 @@ endif
export CROSS_COMPILING export CROSS_COMPILING
ifndef VERSION ifndef VERSION
VERSION=v0.3 VERSION=v0.4
endif endif
ifndef CLIENTBIN ifndef CLIENTBIN

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

@ -839,13 +839,13 @@ static void CG_DrawRallyStatusBar( void ) {
} }
if (cg.predictedPlayerState.powerups[PW_REDFLAG]) if (cg.predictedPlayerState.powerups[PW_REDFLAG])
CG_DrawStatusBarFlag( 525, TEAM_RED); CG_DrawStatusBarFlag( 495, TEAM_RED);
else if (cg.predictedPlayerState.powerups[PW_BLUEFLAG]) else if (cg.predictedPlayerState.powerups[PW_BLUEFLAG])
CG_DrawStatusBarFlag( 525, TEAM_BLUE); CG_DrawStatusBarFlag( 495, TEAM_BLUE);
else if (cg_entities[cg.snap->ps.clientNum].finishRaceTime && else if (cg_entities[cg.snap->ps.clientNum].finishRaceTime &&
cg_entities[cg.snap->ps.clientNum].currentPosition == 1){ cg_entities[cg.snap->ps.clientNum].currentPosition == 1){
CG_DrawStatusBarFlag( 525, 15); CG_DrawStatusBarFlag( 495, 15);
} }
if ( ps->stats[ STAT_ARMOR ] ) { if ( ps->stats[ STAT_ARMOR ] ) {

6
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_r512" #define PRODUCT_VERSION "v0.4_r513"
#endif #endif
@ -433,8 +433,8 @@ extern vec3_t bytedirs[NUMVERTEXNORMALS];
#define SMALLCHAR_HEIGHT 16 #define SMALLCHAR_HEIGHT 16
#endif #endif
#define BIGCHAR_WIDTH 10 #define BIGCHAR_WIDTH 14 //10
#define BIGCHAR_HEIGHT 10 #define BIGCHAR_HEIGHT 14 //10
#define GIANTCHAR_WIDTH 20 #define GIANTCHAR_WIDTH 20
#define GIANTCHAR_HEIGHT 30 #define GIANTCHAR_HEIGHT 30

22
q3rallycode.ppr
View file

@ -124,7 +124,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
@ -456,7 +456,7 @@ q3rallycode
engine\code\null\null_main.c engine\code\null\null_main.c
engine\code\null\null_net.c engine\code\null\null_net.c
engine\code\null\null_snddma.c engine\code\null\null_snddma.c
-q3_ui +q3_ui
engine\code\q3_ui\ui.def engine\code\q3_ui\ui.def
engine\code\q3_ui\ui_addbots.c engine\code\q3_ui\ui_addbots.c
engine\code\q3_ui\ui_atoms.c engine\code\q3_ui\ui_atoms.c
@ -895,23 +895,24 @@ q3rallycode
5=engine\code\cgame\cg_scoreboard.c 5=engine\code\cgame\cg_scoreboard.c
6=engine\code\q3_ui\ui_rally_credits.c 6=engine\code\q3_ui\ui_rally_credits.c
7=engine\code\q3_ui\ui_menu.c 7=engine\code\q3_ui\ui_menu.c
8=engine\code\q3_ui\ui_video.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\q3_ui\ui_menu.c Selected=engine\code\cgame\cg_draw.c
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=54 TopLine=419
Caret=35,70 Caret=27,437
[engine\code\cgame\cg_draw.c] [engine\code\cgame\cg_draw.c]
TopLine=832 TopLine=828
Caret=32,848 Caret=28,848
[engine\code\cgame\cg_local.h] [engine\code\cgame\cg_local.h]
TopLine=57 TopLine=57
Caret=29,73 Caret=27,76
[engine\code\cgame\cg_event.c] [engine\code\cgame\cg_event.c]
TopLine=275 TopLine=275
Caret=58,297 Caret=58,297
[engine\code\ui\ui_local.h] [engine\code\ui\ui_local.h]
TopLine=135 TopLine=129
Caret=1,139 Caret=1,139
[engine\code\cgame\cg_scoreboard.c] [engine\code\cgame\cg_scoreboard.c]
TopLine=54 TopLine=54
@ -922,3 +923,6 @@ Caret=45,107
[engine\code\q3_ui\ui_menu.c] [engine\code\q3_ui\ui_menu.c]
TopLine=572 TopLine=572
Caret=66,592 Caret=66,592
[engine\code\q3_ui\ui_video.c]
TopLine=1
Caret=1,1085