diff --git a/engine/Makefile b/engine/Makefile index 0d27df02..fdb3f31b 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -111,7 +111,7 @@ endif export CROSS_COMPILING ifndef VERSION -VERSION=v0.3 +VERSION=v0.4 endif ifndef CLIENTBIN diff --git a/engine/code/cgame/cg_draw.c b/engine/code/cgame/cg_draw.c index 97dff7d4..0d4070cb 100644 --- a/engine/code/cgame/cg_draw.c +++ b/engine/code/cgame/cg_draw.c @@ -839,13 +839,13 @@ static void CG_DrawRallyStatusBar( void ) { } if (cg.predictedPlayerState.powerups[PW_REDFLAG]) - CG_DrawStatusBarFlag( 525, TEAM_RED); + CG_DrawStatusBarFlag( 495, TEAM_RED); 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 && cg_entities[cg.snap->ps.clientNum].currentPosition == 1){ - CG_DrawStatusBarFlag( 525, 15); + CG_DrawStatusBarFlag( 495, 15); } if ( ps->stats[ STAT_ARMOR ] ) { diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index b2a102fb..a88f3f60 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.4_r512" +#define PRODUCT_VERSION "v0.4_r513" #endif @@ -433,8 +433,8 @@ extern vec3_t bytedirs[NUMVERTEXNORMALS]; #define SMALLCHAR_HEIGHT 16 #endif -#define BIGCHAR_WIDTH 10 -#define BIGCHAR_HEIGHT 10 +#define BIGCHAR_WIDTH 14 //10 +#define BIGCHAR_HEIGHT 14 //10 #define GIANTCHAR_WIDTH 20 #define GIANTCHAR_HEIGHT 30 diff --git a/q3rallycode.ppr b/q3rallycode.ppr index fa8d8381..d73ea4af 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -124,7 +124,7 @@ q3rallycode engine\code\botlib\l_utils.h engine\code\botlib\lcc.mak engine\code\botlib\linux-i386.mak - +cgame + -cgame engine\code\cgame\cg_atmospheric.c engine\code\cgame\cg_consolecmds.c engine\code\cgame\cg_draw.c @@ -456,7 +456,7 @@ q3rallycode engine\code\null\null_main.c engine\code\null\null_net.c engine\code\null\null_snddma.c - -q3_ui + +q3_ui engine\code\q3_ui\ui.def engine\code\q3_ui\ui_addbots.c engine\code\q3_ui\ui_atoms.c @@ -895,23 +895,24 @@ q3rallycode 5=engine\code\cgame\cg_scoreboard.c 6=engine\code\q3_ui\ui_rally_credits.c 7=engine\code\q3_ui\ui_menu.c +8=engine\code\q3_ui\ui_video.c [Selected Project Files] Main= -Selected=engine\code\q3_ui\ui_menu.c +Selected=engine\code\cgame\cg_draw.c [engine\code\qcommon\q_shared.h] -TopLine=54 -Caret=35,70 +TopLine=419 +Caret=27,437 [engine\code\cgame\cg_draw.c] -TopLine=832 -Caret=32,848 +TopLine=828 +Caret=28,848 [engine\code\cgame\cg_local.h] TopLine=57 -Caret=29,73 +Caret=27,76 [engine\code\cgame\cg_event.c] TopLine=275 Caret=58,297 [engine\code\ui\ui_local.h] -TopLine=135 +TopLine=129 Caret=1,139 [engine\code\cgame\cg_scoreboard.c] TopLine=54 @@ -922,3 +923,6 @@ Caret=45,107 [engine\code\q3_ui\ui_menu.c] TopLine=572 Caret=66,592 +[engine\code\q3_ui\ui_video.c] +TopLine=1 +Caret=1,1085