From c8e091221e1177d074a83cf57cad3e32d277e98f Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Sun, 5 Sep 2010 14:10:30 +0300 Subject: [PATCH] Final fixes and improvements. This branch can now be merged --- data/qcsrc/client/main.qh | 5 ++- data/qcsrc/client/sbar.qc | 87 +++++++++++++++++++++------------------ 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/data/qcsrc/client/main.qh b/data/qcsrc/client/main.qh index 8eefe03c..e0196266 100644 --- a/data/qcsrc/client/main.qh +++ b/data/qcsrc/client/main.qh @@ -76,8 +76,9 @@ const float COLOR_SPECTATOR = 1337; #define SP_SEPARATOR -100 -#define ST_NAME -1 -#define ST_HEALTH -2 +#define ST_HIGHLIGHT -1 +#define ST_NAME -2 +#define ST_HEALTH -3 float sbar_field[MAX_SBAR_FIELDS + 1]; float sbar_size[MAX_SBAR_FIELDS + 1]; diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc index 5b61c3af..0022a7c1 100644 --- a/data/qcsrc/client/sbar.qc +++ b/data/qcsrc/client/sbar.qc @@ -728,6 +728,9 @@ string Sbar_GetStomachField(entity pl, float field) sbar_field_icon2_alpha = 1; switch(field) { + case ST_HIGHLIGHT: + return ""; // the returned value is not used, we only need the field + case ST_NAME: return GetPlayerName(pl.sv_entnum); @@ -949,12 +952,13 @@ void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_num float fieldcounter; void Sbar_PrintStomachboardItem(vector pos, entity pl) { - // list the players in the stomach + // lists all players in the stomach string str; - float f, field; + float f, field, field_number; + field_number = 3; // the number of components each row has - for(fieldcounter = 1; fieldcounter <= 2; ++fieldcounter) + for(fieldcounter = 1; fieldcounter <= field_number; ++fieldcounter) { field = -fieldcounter; if(field == SP_SEPARATOR) @@ -962,7 +966,8 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl) str = Sbar_GetStomachField(pl, field); - if(field == ST_NAME) // do this for one field, or we get multiple highlights in the same spot + // row highlighting + if(field == ST_HIGHLIGHT) { if(getstati(STAT_STOMACH_EATEN)) drawfill(pos - '0 0 0', '193 11 0', stov(cvar_string("sbar_stomachboard_color2")), cvar("sbar_stomachboard_highlight_alpha"), DRAWFLAG_NORMAL); @@ -997,14 +1002,15 @@ void Sbar_PrintStomachboardItem(vector pos, entity pl) } float fieldcounter2; -void Sbar_PrintStomachboardItem2(vector pos, entity pl) +void Sbar_PrintStomachboardItemPred(vector pos, entity pl) { - // show the name of our eater + // shows the name of our eater string str; - float f, field; + float f, field, field_number; + field_number = 1; // the number of components each row has - for(fieldcounter2 = 1; fieldcounter2 <= 2; ++fieldcounter2) + for(fieldcounter2 = 1; fieldcounter2 <= field_number; ++fieldcounter2) { field = -fieldcounter2; if(field == SP_SEPARATOR) @@ -2625,28 +2631,28 @@ float vote_prev; // previous state of vote_active to check for a change float vote_alpha; float vote_change; // "time" when vote_active changed -vector colortrans_current; -vector Stomachstatus_Colortrans(vector target_color) +vector stomachstatus_colorfade_current; +vector StomachStatus_ColorFade(vector target_color) { local float step; step = cvar("sbar_stomachboard_status_fade"); - if(colortrans_current_x > target_color_x + step) - colortrans_current_x -= step; - else if(colortrans_current_x < target_color_x - step) - colortrans_current_x += step; + if(stomachstatus_colorfade_current_x >= target_color_x + step) + stomachstatus_colorfade_current_x -= step; + else if(stomachstatus_colorfade_current_x <= target_color_x - step) + stomachstatus_colorfade_current_x += step; - if(colortrans_current_y > target_color_y + step) - colortrans_current_y -= step; - else if(colortrans_current_y < target_color_y - step) - colortrans_current_y += step; + if(stomachstatus_colorfade_current_y >= target_color_y + step) + stomachstatus_colorfade_current_y -= step; + else if(stomachstatus_colorfade_current_y <= target_color_y - step) + stomachstatus_colorfade_current_y += step; - if(colortrans_current_z > target_color_z + step) - colortrans_current_z -= step; - else if(colortrans_current_z < target_color_z - step) - colortrans_current_z += step; + if(stomachstatus_colorfade_current_z >= target_color_z + step) + stomachstatus_colorfade_current_z -= step; + else if(stomachstatus_colorfade_current_z <= target_color_z - step) + stomachstatus_colorfade_current_z += step; - return colortrans_current; + return stomachstatus_colorfade_current; } void Sbar_Draw (void) @@ -2915,7 +2921,7 @@ void Sbar_Draw (void) Sbar_Reset(); - Stomachstatus_Colortrans('0 0 0'); + StomachStatus_ColorFade('0 0 0'); } else { @@ -2933,7 +2939,8 @@ void Sbar_Draw (void) fade = 3.2 - 2 * (time - weapontime); fade = bound(0.7, fade, 1); - if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) { + // draw the stomach board + if (cvar("viewsize") <= 100) { if (teamplay) drawpic(bottomleft- '0 256 0', "gfx/hud/bg_stomach", '256 256 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color else { @@ -2944,24 +2951,26 @@ void Sbar_Draw (void) drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach", '256 256 0', color, sbar_alpha_bg, DRAWFLAG_NORMAL); } + } - if(getstati(STAT_STOMACH_EATEN)) - { - drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); - drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - } - else - { - drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', Stomachstatus_Colortrans(stov(cvar_string("sbar_stomachboard_color1"))), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); - drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); - } + if(getstati(STAT_STOMACH_EATEN)) + { + drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color2"))), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); + drawstring(bottomleft - '-80 172 0', "predator:", '10 10 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); } + else + { + drawpic(bottomleft - '0 256 0', "gfx/hud/bg_stomach_status", '256 256 0', StomachStatus_ColorFade(stov(cvar_string("sbar_stomachboard_color1"))), cvar("sbar_stomachboard_status_alpha"), DRAWFLAG_NORMAL); + drawstring(bottomleft - '-80 172 0', "self:", '10 10 0', ' 1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); + } + float stomach_load; stomach_load = getstati(STAT_STOMACH_LOAD); // shows the predator's stomach load when we are eaten, and ours otherwise Sbar_DrawXNum(bottomleft - '-18 170 0', bound(0, stomach_load, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL); drawstring(bottomleft - '-40 170 0', "/", '22 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL); Sbar_DrawXNum(bottomleft - '-50 170 0', bound(0, g_balance_vore_swallow_limit, 9), 1, 0, 22, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL); + if(getstati(STAT_STOMACH_DIGESTING)) drawstring(bottomleft - '-76 142 0', "stomach digesting", '12 12 0', '1 0.5 0.5', sbar_alpha_fg, DRAWFLAG_NORMAL); else if(stomach_load == g_balance_vore_swallow_limit) @@ -2971,7 +2980,7 @@ void Sbar_Draw (void) else drawstring(bottomleft - '-76 142 0', "stomach has prey", '12 12 0', '0.75 1 0.75', sbar_alpha_fg, DRAWFLAG_NORMAL); - // draw the stomach board + // draw the stomach board player list entity pl; float f; @@ -2982,9 +2991,7 @@ void Sbar_Draw (void) continue; if(getstati(STAT_STOMACH_EATEN)) - { f = pl.pleater == getstati(STAT_STOMACH_EATEN); - } else { if(spectatee_status) @@ -3001,10 +3008,10 @@ void Sbar_Draw (void) if(getstati(STAT_STOMACH_EATEN)) if(pl.sv_entnum == getstati(STAT_STOMACH_EATEN) - 1) - Sbar_PrintStomachboardItem2(bottomleft - '-76 156 0', pl); + Sbar_PrintStomachboardItemPred(bottomleft - '-76 156 0', pl); } - if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) { + if (cvar("viewsize") <= 100) { if (teamplay) drawpic(bottom - '96 96 0', "gfx/hud/bg_status", '192 96 0', GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color else { -- 2.39.2