diff --git a/engine/code/cgame/cg_draw.c b/engine/code/cgame/cg_draw.c index 220b04b4..b8cc8faf 100644 --- a/engine/code/cgame/cg_draw.c +++ b/engine/code/cgame/cg_draw.c @@ -545,11 +545,11 @@ void CG_DrawSigilHUD( void ) { break; case SIGIL_ISRED: - CG_DrawPic( x, y, 18, 18, cgs.media.redFlagShader[0] ); + CG_DrawPic( x, y, 18, 18, cgs.media.redsigilShader ); break; case SIGIL_ISBLUE: - CG_DrawPic( x, y, 18, 18, cgs.media.blueFlagShader[0] ); + CG_DrawPic( x, y, 18, 18, cgs.media.bluesigilShader ); break; } x+= 19; @@ -720,8 +720,8 @@ static void CG_DrawRallyStatusBar( void ) { // draw the dtf sigils -// if ( cgs.gametype == GT_DOMINATION ) -// CG_DrawSigilHUD(); + if ( cgs.gametype == GT_DOMINATION ) + CG_DrawSigilHUD(); cent = &cg_entities[cg.snap->ps.clientNum]; ps = &cg.snap->ps; @@ -761,10 +761,10 @@ static void CG_DrawRallyStatusBar( void ) { // armor background if ( ps->stats[ STAT_ARMOR ] ) // CG_FillRect( 190, 476 - 68, 106, 32, bg_color ); - CG_FillRect( 370, 476 - 32, 106, 32, bg_color ); + CG_FillRect( 256, 476 - 32, 106, 32, bg_color ); // health background - CG_FillRect( 190, 476 - 32, 106, 32, bg_color ); + CG_FillRect( 130, 476 - 32, 106, 32, bg_color ); // rearammo background weapon = 0; @@ -805,7 +805,7 @@ static void CG_DrawRallyStatusBar( void ) { origin[1] = 0; origin[2] = -5; angles[YAW] = 180 * sin( cg.time / 1000.0 ); - CG_Draw3DModel( 196, 476 - 28, 26, 26, + CG_Draw3DModel( 136, 476 - 28, 26, 26, healthModel, 0, origin, angles ); } @@ -825,7 +825,7 @@ static void CG_DrawRallyStatusBar( void ) { origin[2] = -10; angles[YAW] = ( cg.time & 2047 ) * 360 / 2048.0; // CG_Draw3DModel( 196, 476 - 64, 26, 26, - CG_Draw3DModel( 376, 476 - 28, 26, 26, + CG_Draw3DModel( 262, 476 - 28, 26, 26, cgs.media.armorModel, 0, origin, angles ); } @@ -929,7 +929,7 @@ static void CG_DrawRallyStatusBar( void ) { } // stretch the health up when taking damage - CG_DrawField ( 242, 476 - 28, 3, value); + CG_DrawField ( 178, 476 - 28, 3, value); CG_ColorForHealth( hcolor ); trap_R_SetColor( hcolor ); @@ -941,7 +941,7 @@ static void CG_DrawRallyStatusBar( void ) { if (value > 0 ) { trap_R_SetColor( colors[0] ); // CG_DrawField ( 242, 476 - 64, 3, value); - CG_DrawField ( 422, 476 - 28, 3, value); + CG_DrawField ( 304, 476 - 28, 3, value); trap_R_SetColor( NULL ); // if we didn't draw a 3D icon, draw a 2D icon for armor if ( !cg_draw3dIcons.integer && cg_drawIcons.integer ) { diff --git a/engine/code/cgame/cg_local.h b/engine/code/cgame/cg_local.h index 5281782c..d575f9aa 100644 --- a/engine/code/cgame/cg_local.h +++ b/engine/code/cgame/cg_local.h @@ -842,6 +842,8 @@ typedef struct { qhandle_t flagShader[4]; // Q3Rally Code Start qhandle_t sigilShader; + qhandle_t redsigilShader; + qhandle_t bluesigilShader; // Q3Rally Code END qhandle_t flagPoleModel; qhandle_t flagFlapModel; diff --git a/engine/code/cgame/cg_main.c b/engine/code/cgame/cg_main.c index f1ab16a3..810af9e8 100644 --- a/engine/code/cgame/cg_main.c +++ b/engine/code/cgame/cg_main.c @@ -1102,6 +1102,8 @@ static void CG_RegisterGraphics( void ) { cgs.media.blueFlagShader[2] = trap_R_RegisterShaderNoMip( "icons/iconf_blu3" ); // Q3Rally Code Start cgs.media.sigilShader = trap_R_RegisterShaderNoMip( "icons/iconf_neutral1" ); + cgs.media.redsigilShader = trap_R_RegisterShaderNoMip( "icons/iconf_red1" ); + cgs.media.bluesigilShader = trap_R_RegisterShaderNoMip( "icons/iconf_blu1" ); // Q3Rally Code END #ifdef MISSIONPACK diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index bffc9fb8..e56c32f0 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.0.3.0_r385" +#define PRODUCT_VERSION "v0.0.3.0_r388" #endif diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 5372f478..1848eab9 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -95,7 +95,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 @@ -427,7 +427,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 @@ -860,20 +860,26 @@ q3rallycode [Open project files] 0=engine\code\qcommon\q_shared.h 1=engine\code\q3_ui\ui_qmenu.c -2=engine\code\q3_ui\ui_menu.c -3=engine\code\cgame\cg_ents.c -4=engine\code\cgame\cg_rally_hud.c -5=engine\code\cgame\cg_rally_hud2.c -6=engine\code\cgame\cg_draw.c -7=engine\code\cgame\cg_local.h -8=engine\code\game\g_weapon.c -9=engine\code\game\g_local.h -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 +2=engine\code\cgame\cg_rally_hud.c +3=engine\code\cgame\cg_draw.c +4=engine\code\cgame\cg_local.h +5=engine\code\game\g_weapon.c +6=engine\code\game\g_local.h +7=engine\code\cgame\cg_weapons.c +8=engine\code\game\bg_misc.c +9=engine\code\game\bg_public.h +10=engine\code\game\g_items.c +11=engine\code\cgame\cg_effects.c +12=engine\code\cgame\cg_main.c +13=engine\ui\menudef.h +14=engine\code\q3_ui\ui_controls2.c +15=engine\code\ui\ui_shared.c +16=engine\code\q3_ui\ui_atoms.c +17=engine\code\ui\ui_main.c +18=engine\code\q3_ui\ui_local.h +19=engine\code\q3_ui\ui_players.c +20=engine\code\game\g_team.c +21=engine\code\game\g_spawn.c [Selected Project Files] Main= Selected=engine\code\qcommon\q_shared.h @@ -883,24 +889,15 @@ Caret=39,70 [engine\code\q3_ui\ui_qmenu.c] TopLine=2273 Caret=1,2287 -[engine\code\q3_ui\ui_menu.c] -TopLine=477 -Caret=1,492 -[engine\code\cgame\cg_ents.c] -TopLine=517 -Caret=1,532 [engine\code\cgame\cg_rally_hud.c] TopLine=1 Caret=3,819 -[engine\code\cgame\cg_rally_hud2.c] -TopLine=1 -Caret=126,75 [engine\code\cgame\cg_draw.c] -TopLine=930 +TopLine=928 Caret=26,944 [engine\code\cgame\cg_local.h] -TopLine=1940 -Caret=4,1955 +TopLine=830 +Caret=6,846 [engine\code\game\g_weapon.c] TopLine=128 Caret=16,146 @@ -908,14 +905,14 @@ Caret=16,146 TopLine=637 Caret=1,652 [engine\code\cgame\cg_weapons.c] -TopLine=2011 -Caret=32,2032 +TopLine=2014 +Caret=1,2002 [engine\code\game\bg_misc.c] -TopLine=65 -Caret=11,89 +TopLine=1486 +Caret=1,1500 [engine\code\game\bg_public.h] -TopLine=808 -Caret=1,823 +TopLine=417 +Caret=1,431 [engine\code\game\g_items.c] TopLine=486 Caret=1,501 @@ -923,5 +920,32 @@ Caret=1,501 TopLine=612 Caret=1,627 [engine\code\cgame\cg_main.c] -TopLine=892 -Caret=84,907 +TopLine=1090 +Caret=30,1104 +[engine\ui\menudef.h] +TopLine=19 +Caret=1,33 +[engine\code\q3_ui\ui_controls2.c] +TopLine=1488 +Caret=1,1502 +[engine\code\ui\ui_shared.c] +TopLine=3334 +Caret=1,3358 +[engine\code\q3_ui\ui_atoms.c] +TopLine=1067 +Caret=3,1084 +[engine\code\ui\ui_main.c] +TopLine=5249 +Caret=1,5261 +[engine\code\q3_ui\ui_local.h] +TopLine=698 +Caret=3,715 +[engine\code\q3_ui\ui_players.c] +TopLine=1201 +Caret=6,1081 +[engine\code\game\g_team.c] +TopLine=1114 +Caret=24,1155 +[engine\code\game\g_spawn.c] +TopLine=318 +Caret=1,332