From: FruitieX Date: Thu, 6 May 2010 17:28:42 +0000 (+0300) Subject: little restructure X-Git-Tag: xonotic-v0.1.0preview~541^2~210 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cff22517daf1eccda5fe41999619a1b6c1bbb725;p=xonotic%2Fxonotic-data.pk3dir.git little restructure --- diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 90563dec0..8a230c343 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -321,9 +321,9 @@ void Playerchecker_Think() e.ping_packetloss = 0; e.ping_movementloss = 0; //e.gotscores = 0; // we might already have the scores... - SetTeam(e, GetPlayerColor(i)); // will not hurt; later updates come with Sbar_UpdatePlayerTeams + SetTeam(e, GetPlayerColor(i)); // will not hurt; later updates come with HUD_UpdatePlayerTeams RegisterPlayer(e); - Sbar_UpdatePlayerPos(e); + HUD_UpdatePlayerPos(e); } } } @@ -351,8 +351,8 @@ void PostInit(void) // CSQC_ConsoleCommand : Used to parse commands in the console that have been registered with the "registercmd" function // Return value should be 1 if CSQC handled the command, otherwise return 0 to have the engine handle it. float button_zoom; -void Cmd_Sbar_SetFields(float); -void Cmd_Sbar_Help(float); +void Cmd_HUD_SetFields(float); +void Cmd_HUD_Help(float); float CSQC_ConsoleCommand(string strMessage) { float argc; @@ -527,10 +527,10 @@ void GameCommand(string msg) ons_showmap = !ons_showmap; } else if(cmd == "sbar_columns_set") { - Cmd_Sbar_SetFields(argc); + Cmd_HUD_SetFields(argc); } else if(cmd == "sbar_columns_help") { - Cmd_Sbar_Help(argc); + Cmd_HUD_Help(argc); } #ifdef BLURTEST else if(cmd == "blurtest") { @@ -721,7 +721,7 @@ void Ent_ReadPlayerScore() } if(o.sort_prev) - Sbar_UpdatePlayerPos(o); // if not registered, we cannot do this yet! + HUD_UpdatePlayerPos(o); // if not registered, we cannot do this yet! self.entremove = Ent_RemovePlayerScore; } @@ -752,7 +752,7 @@ void Ent_ReadTeamScore() o.(teamscores[i]) = ReadChar(); } - Sbar_UpdateTeamPos(o); + HUD_UpdateTeamPos(o); } void Net_Reset() @@ -999,7 +999,7 @@ void Ent_ScoresInfo() teamscores_label[i] = strzone(ReadString()); teamscores_flags[i] = ReadByte(); } - Sbar_InitScores(); + HUD_InitScores(); Gamemode_Init(); } diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 9cccdb26c..e9354c00a 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -336,7 +336,7 @@ void CSQC_kh_hud(void); void CSQC_ctf_hud(void); void PostInit(void); void CSQC_Demo_Camera(); -float Sbar_WouldDrawScoreboard (); +float HUD_WouldDrawScoreboard (); float view_set; float camera_mode; string NextFrameCommand; @@ -457,7 +457,7 @@ void CSQC_UpdateView(float w, float h) if(f != teamplay) { teamplay = f; - Sbar_InitScores(); + HUD_InitScores(); } if(last_weapon != activeweapon) { @@ -507,7 +507,7 @@ void CSQC_UpdateView(float w, float h) // Draw the Crosshair float scoreboard_active; - scoreboard_active = Sbar_WouldDrawScoreboard(); + scoreboard_active = HUD_WouldDrawScoreboard(); R_SetView(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden // Draw the Engine Status Bar (the default Quake HUD) @@ -563,11 +563,6 @@ void CSQC_UpdateView(float w, float h) // draw sbar if(cvar("r_letterbox") == 0) { - if (cvar("cl_showspeed")) - HUD_ShowSpeed(); - if (cvar("cl_showacceleration")) - HUD_ShowAcceleration(); - HUD_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120 } @@ -941,7 +936,7 @@ void CSQC_SPIDER_HUD() if (sb_showscores) { - Sbar_DrawScoreboard(); + HUD_DrawScoreboard(); HUD_DrawCenterPrint(); } @@ -1011,7 +1006,7 @@ void CSQC_RAPTOR_HUD() if (sb_showscores) { - Sbar_DrawScoreboard(); + HUD_DrawScoreboard(); HUD_DrawCenterPrint(); } @@ -1121,7 +1116,7 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66; if (sb_showscores) { - Sbar_DrawScoreboard(); + HUD_DrawScoreboard(); HUD_DrawCenterPrint(); } @@ -1130,7 +1125,7 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66; void CSQC_common_hud(void) { - // Sbar_SortFrags(); done in Sbar_Draw + // HUD_SortFrags(); done in HUD_Draw float hud; hud = getstati(STAT_HUD); @@ -1138,6 +1133,30 @@ void CSQC_common_hud(void) switch(hud) { case HUD_NORMAL: + // is this needed? + //HUD_UpdatePlayerTeams(); + if (intermission == 2) // map voting screen + { + if(sb_showaccuracy && spectatee_status != -1) { + HUD_DrawAccuracyStats(); + } + else if(sb_showscores) { + HUD_DrawScoreboard(); + } + else + HUD_FinaleOverlay(); + + HUD_Reset(); + } + else if (sb_showscores || sb_showaccuracy || sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1) + { + if(sb_showaccuracy && spectatee_status != -1) + HUD_DrawAccuracyStats(); + else + HUD_DrawScoreboard(); + + HUD_Reset(); + } HUD_Main(); break; diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index ab9e6540e..3b8b7169c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -265,7 +265,7 @@ void centerprint(string strMessage) float i, j, n, hcount; string s; - centerprint_fontsize = Sbar_GetFontsize("scr_centersize"); + centerprint_fontsize = HUD_GetFontsize("scr_centersize"); centerprint_expire = min(centerprint_expire, time); // if any of the returns happens, this message will fade out @@ -2721,8 +2721,8 @@ void HUD_Main (void) hud_accuracy_border_thickness = bound(0, cvar_or("hud_accuracy_border_thickness", 1), 5); hud_color_bg_team = cvar("hud_color_bg_team"); - sbar_fontsize = Sbar_GetFontsize("sbar_fontsize"); - sbar_fontsize_spec = Sbar_GetFontsize("sbar_fontsize_spec"); + sbar_fontsize = HUD_GetFontsize("sbar_fontsize"); + sbar_fontsize_spec = HUD_GetFontsize("sbar_fontsize_spec"); if(HUD_Panel_CheckActive(0)) HUD_WeaponIcons(); @@ -2750,63 +2750,20 @@ void HUD_Main (void) if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2 || cvar("_hud_configure")) HUD_DrawPressedKeys(); - /* these are right now taken care of in View.qc - if(HUD_Panel_CheckActive(0)) + // TODO hud_'ify these + if (cvar("cl_showspeed")) HUD_ShowSpeed(); - if(HUD_Panel_CheckActive(0)) + if (cvar("cl_showacceleration")) HUD_ShowAcceleration(); - */ - - //Sbar_UpdatePlayerTeams(); - // move this stuff to View.qc - if (intermission == 2) // map voting screen - { - if(sb_showaccuracy && spectatee_status != -1) { - //HUD_DrawAccuracyStats(); - //HUD_Score(); - //HUD_Timer(); - } - else if(sb_showscores) { - //HUD_DrawScoreboard(); - //HUD_Score(); - //HUD_Timer(); - } - else - //HUD_FinaleOverlay(); - HUD_Reset(); - } - else if (sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1) - { - //if(sb_showaccuracy && spectatee_status != -1) - //HUD_DrawAccuracyStats(); - //else - //HUD_DrawScoreboard(); - //HUD_Score(); - //HUD_Timer(); - - //HUD_Reset(); - } - else - { - //if(sb_showaccuracy && spectatee_status != -1) - //HUD_DrawAccuracyStats(); - //else - // HUD_DrawScoreboard(); - - // draw scores and timer - //HUD_Score(); - //HUD_Timer(); - - // draw gametype specific icons - if(gametype == GAME_KEYHUNT) - CSQC_kh_hud(); - else if(gametype == GAME_CTF) - CSQC_ctf_hud(); - else if(gametype == GAME_NEXBALL) - CSQC_nb_hud(); - else if(gametype == GAME_CTS || gametype == GAME_RACE) - CSQC_race_hud(); - } + // TODO... well make them work in a panel etc + if(gametype == GAME_KEYHUNT) + CSQC_kh_hud(); + else if(gametype == GAME_CTF) + CSQC_ctf_hud(); + else if(gametype == GAME_NEXBALL) + CSQC_nb_hud(); + else if(gametype == GAME_CTS || gametype == GAME_RACE) + CSQC_race_hud(); return; } diff --git a/qcsrc/client/mapvoting.qc b/qcsrc/client/mapvoting.qc index 2dcd55200..e7d318fb6 100644 --- a/qcsrc/client/mapvoting.qc +++ b/qcsrc/client/mapvoting.qc @@ -184,7 +184,7 @@ void MapVote_Draw() ymax = vid_conheight - ymin; drawfont = sbar_bigfont; - sbar_fontsize = Sbar_GetFontsize("sbar_fontsize"); + sbar_fontsize = HUD_GetFontsize("sbar_fontsize"); pos_y = ymin; pos_z = 0; diff --git a/qcsrc/client/miscfunctions.qc b/qcsrc/client/miscfunctions.qc index 63f0faf76..e97b3fd75 100644 --- a/qcsrc/client/miscfunctions.qc +++ b/qcsrc/client/miscfunctions.qc @@ -308,7 +308,7 @@ void CSQC_CheckEngine() sbar_bigfont = FONT_USER+2; } -vector Sbar_GetFontsize(string cvarname) +vector HUD_GetFontsize(string cvarname) { vector v; v = stov(cvar_string(cvarname)); @@ -320,7 +320,7 @@ vector Sbar_GetFontsize(string cvarname) return v; } -float Sbar_GetWidth(float teamcolumnwidth) +float HUD_GetWidth(float teamcolumnwidth) { float f; f = cvar("sbar_width"); diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 9be58e806..cf35a23ba 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -12,7 +12,7 @@ void drawstringcenter(vector, string, vector, vector, float, float); float SCOREBOARD_OFFSET = 50; void MapVote_Draw(); -void Sbar_FinaleOverlay() +void HUD_FinaleOverlay() { /*vector pos; pos_x = (vid_conwidth - 1)/2; @@ -25,100 +25,8 @@ void Sbar_FinaleOverlay() MapVote_Draw(); } -void Sbar_DrawXNum (vector pos, float num, float digits, float showminusplus, float lettersize, vector rgb, float highlighted, float stroke, float alpha, float dflags) -{ - float l, i; - string str, tmp, l_length; - float minus, plus; - vector vsize, num_color; - - vsize_x = vsize_y = lettersize; - vsize_z = 0; - - // showminusplus 1: always prefix with minus sign (useful in race distribution display) - // showminusplus 2: always prefix with plus sign (useful in race distribution display) - // showminusplus 3: prefix with minus sign if negative, plus sign if positive (useful in score distribution display) - - if((showminusplus == 2 && num >= 0) || (num > 0 && showminusplus == 3)) - { - plus = true; - pos_x -= lettersize; - } else - plus = false; - - if(num < 0 || (num < 0 && showminusplus == 3) || (showminusplus == 1 && num <= 0)) - { - minus = true; - num = -num; - pos_x -= lettersize; - } else - minus = false; - - if(digits < 0) - { - tmp = ftos(num); - digits = -digits; - str = strcat(substring("0000000000", 0, digits - strlen(tmp)), tmp); - } else - str = ftos(num); - - l = strlen(str); - l_length = ftos(l); - - if(l > digits) - { - str = substring(str, l-digits, 999); - l = strlen(str); - } else if(l < digits) - pos_x += (digits-l) * lettersize; - - if (highlighted == 1) { - vector hl_size; - hl_size_x = vsize_x * l + vsize_x * 0.2; - hl_size_y = vsize_y * 1.1; - hl_size_z = 0; - if(minus) - hl_size_x = hl_size_x + vsize_x; - - vector hl_pos; - hl_pos_x = pos_x - lettersize/10; - hl_pos_y = pos_y - lettersize/20; - hl_pos_z = 0; - - drawpic(hl_pos, strcat("gfx/hud/sb_highlight_", l_length), hl_size, '1 1 1', alpha, dflags); - } - - if (stroke == 1) - num_color = '1 1 1'; - else - num_color = rgb; - - if(minus) - { - if (stroke == 1) - drawpic(pos, "gfx/hud/num_minus_stroke", vsize, rgb, alpha, dflags); - drawpic(pos, "gfx/hud/num_minus", vsize, num_color, alpha, dflags); - pos_x += lettersize; - } else if(plus) - { - if (stroke == 1) - drawpic(pos, "gfx/hud/num_plus_stroke", vsize, rgb, alpha, dflags); - drawpic(pos, "gfx/hud/num_plus", vsize, num_color, alpha, dflags); - pos_x += lettersize; - } - - for(i = 0; i < l; ++i) - { - tmp = substring(str, i, 1); - if (stroke == 1) - drawpic(pos, strcat("gfx/hud/num_", tmp, "_stroke"), vsize, rgb, alpha, dflags); - drawpic(pos, strcat("gfx/hud/num_", tmp), vsize, num_color, alpha, dflags); - pos_x += lettersize; - } -} - -void Cmd_Sbar_SetFields(float argc); -void Sbar_InitScores() +void Cmd_HUD_SetFields(float argc); +void HUD_InitScores() { float i, f; @@ -145,13 +53,13 @@ void Sbar_InitScores() if(ts_secondary == -1) ts_secondary = ts_primary; - Cmd_Sbar_SetFields(0); + Cmd_HUD_SetFields(0); } -void Sbar_UpdatePlayerPos(entity pl); +void HUD_UpdatePlayerPos(entity pl); float SetTeam(entity pl, float Team); //float lastpnum; -void Sbar_UpdatePlayerTeams() +void HUD_UpdatePlayerTeams() { float Team; entity pl, tmp; @@ -165,7 +73,7 @@ void Sbar_UpdatePlayerTeams() if(SetTeam(pl, Team)) { tmp = pl.sort_prev; - Sbar_UpdatePlayerPos(pl); + HUD_UpdatePlayerPos(pl); if(tmp) pl = tmp; else @@ -179,7 +87,7 @@ void Sbar_UpdatePlayerTeams() */ } -float Sbar_ComparePlayerScores(entity left, entity right) +float HUD_ComparePlayerScores(entity left, entity right) { float vl, vr; vl = GetPlayerColor(left.sv_entnum); @@ -235,19 +143,19 @@ float Sbar_ComparePlayerScores(entity left, entity right) return false; } -void Sbar_UpdatePlayerPos(entity player) +void HUD_UpdatePlayerPos(entity player) { - for(other = player.sort_next; other && Sbar_ComparePlayerScores(player, other); other = player.sort_next) + for(other = player.sort_next; other && HUD_ComparePlayerScores(player, other); other = player.sort_next) { SORT_SWAP(player, other); } - for(other = player.sort_prev; other != players && Sbar_ComparePlayerScores(other, player); other = player.sort_prev) + for(other = player.sort_prev; other != players && HUD_ComparePlayerScores(other, player); other = player.sort_prev) { SORT_SWAP(other, player); } } -float Sbar_CompareTeamScores(entity left, entity right) +float HUD_CompareTeamScores(entity left, entity right) { float vl, vr; @@ -273,19 +181,19 @@ float Sbar_CompareTeamScores(entity left, entity right) return false; } -void Sbar_UpdateTeamPos(entity Team) +void HUD_UpdateTeamPos(entity Team) { - for(other = Team.sort_next; other && Sbar_CompareTeamScores(Team, other); other = Team.sort_next) + for(other = Team.sort_next; other && HUD_CompareTeamScores(Team, other); other = Team.sort_next) { SORT_SWAP(Team, other); } - for(other = Team.sort_prev; other != teams && Sbar_CompareTeamScores(other, Team); other = Team.sort_prev) + for(other = Team.sort_prev; other != teams && HUD_CompareTeamScores(other, Team); other = Team.sort_prev) { SORT_SWAP(other, Team); } } -void Cmd_Sbar_Help(float argc) +void Cmd_HUD_Help(float argc) { print("You can modify the scoreboard using the ^2sbar_columns_set command.\n"); print("^3|---------------------------------------------------------------|\n"); @@ -336,7 +244,7 @@ void Cmd_Sbar_Help(float argc) print("other gamemodes except DM.\n"); } -string Sbar_DefaultColumnLayout() +string HUD_DefaultColumnLayout() { return strcat( // fteqcc sucks "ping pl name | ", @@ -349,7 +257,7 @@ string Sbar_DefaultColumnLayout() "-lms,race,nexball/score"); } -void Cmd_Sbar_SetFields(float argc) +void Cmd_HUD_SetFields(float argc) { float i, j, slash; string str, pattern; @@ -361,12 +269,12 @@ void Cmd_Sbar_SetFields(float argc) argc = tokenizebyseparator(strcat("x ", cvar_string("sbar_columns")), " "); if(argc < 2) - argc = tokenizebyseparator(strcat("x ", Sbar_DefaultColumnLayout()), " "); + argc = tokenizebyseparator(strcat("x ", HUD_DefaultColumnLayout()), " "); if(argc == 2) { if(argv(1) == "default") - argc = tokenizebyseparator(strcat("x ", Sbar_DefaultColumnLayout()), " "); + argc = tokenizebyseparator(strcat("x ", HUD_DefaultColumnLayout()), " "); else if(argv(1) == "all") { string s; @@ -539,7 +447,7 @@ vector sbar_field_icon2_rgb; float sbar_field_icon0_alpha; float sbar_field_icon1_alpha; float sbar_field_icon2_alpha; -string Sbar_GetField(entity pl, float field) +string HUD_GetField(entity pl, float field) { float tmp, num, denom, f; string str; @@ -640,7 +548,7 @@ float sbar_fixscoreboardcolumnwidth_len; float sbar_fixscoreboardcolumnwidth_iconlen; float sbar_fixscoreboardcolumnwidth_marginlen; -string Sbar_FixScoreboardColumnWidth(float i, string str) +string HUD_FixScoreboardColumnWidth(float i, string str) { float field, f; vector sz; @@ -705,7 +613,7 @@ string Sbar_FixScoreboardColumnWidth(float i, string str) return str; } -void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_number) +void HUD_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_number) { vector tmp, rgb; rgb = GetTeamRGB(pl.team); @@ -742,8 +650,8 @@ void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_num pos_x += sbar_size[i] + sbar_fontsize_x; continue; } - str = Sbar_GetField(pl, field); - str = Sbar_FixScoreboardColumnWidth(i, str); + str = HUD_GetField(pl, field); + str = HUD_FixScoreboardColumnWidth(i, str); pos_x += sbar_size[i] + sbar_fontsize_x; @@ -793,8 +701,8 @@ void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_num continue; } - str = Sbar_GetField(pl, field); - str = Sbar_FixScoreboardColumnWidth(i, str); + str = HUD_GetField(pl, field); + str = HUD_FixScoreboardColumnWidth(i, str); if(field == SP_NAME) { tmp_x = sbar_fixscoreboardcolumnwidth_len; // left or right aligned? let's put it right... @@ -832,12 +740,12 @@ void Sbar_PrintScoreboardItem(vector pos, entity pl, float is_self, float pl_num } /* - * Sbar_Scoreboard_MakeTable + * HUD_Scoreboard_MakeTable * * Makes a table for a team (for all playing players in DM) and fills it */ -vector Sbar_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) +vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_size) { float body_table_height, i; vector tmp, column_dim; @@ -940,7 +848,7 @@ vector Sbar_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_si { if(pl.team != tm.team) continue; - Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i); + HUD_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i); pos_y += 1.25 * sbar_fontsize_y; ++i; } @@ -949,7 +857,7 @@ vector Sbar_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_si { if(pl.team == COLOR_SPECTATOR) continue; - Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i); + HUD_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), i); pos_y += 1.25 * sbar_fontsize_y; ++i; } @@ -961,7 +869,7 @@ vector Sbar_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_si return pos; } -float Sbar_WouldDrawScoreboard() { +float HUD_WouldDrawScoreboard() { if (sb_showscores) return 1; else if (intermission == 1) @@ -977,7 +885,7 @@ float Sbar_WouldDrawScoreboard() { float g_minstagib; float average_accuracy; -vector Sbar_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) +vector HUD_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) { float i; float weapon_hit, weapon_damage, weapon_stats; @@ -1079,7 +987,7 @@ vector Sbar_DrawScoreboardAccuracyStats(vector pos, vector rgb, vector bg_size) return pos; } -vector Sbar_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_size) +vector HUD_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg_size) { float i; RANKINGS_RECEIVED_CNT = 0; @@ -1132,11 +1040,11 @@ vector Sbar_DrawScoreboardRankings(vector pos, entity pl, vector rgb, vector bg float sb_fade_alpha; float sbar_woulddrawscoreboard_prev; -float sbar_woulddrawscoreboard_change; // "time" at which Sbar_WouldDrawScoreboard() changed -void Sbar_DrawScoreboard() +float sbar_woulddrawscoreboard_change; // "time" at which HUD_WouldDrawScoreboard() changed +void HUD_DrawScoreboard() { float sbar_woulddrawscoreboard; - sbar_woulddrawscoreboard = Sbar_WouldDrawScoreboard(); + sbar_woulddrawscoreboard = HUD_WouldDrawScoreboard(); if(sbar_woulddrawscoreboard != sbar_woulddrawscoreboard_prev) { sbar_woulddrawscoreboard_change = time; sbar_woulddrawscoreboard_prev = sbar_woulddrawscoreboard; @@ -1170,7 +1078,7 @@ void Sbar_DrawScoreboard() vector rgb, pos, tmp; entity pl, tm; - sbwidth = Sbar_GetWidth(6.5 * sbar_fontsize_y); + sbwidth = HUD_GetWidth(6.5 * sbar_fontsize_y); xmin = 0.5 * (vid_conwidth - sbwidth); ymin = SCOREBOARD_OFFSET; @@ -1204,12 +1112,12 @@ void Sbar_DrawScoreboard() continue; rgb = GetTeamRGB(tm.team); - Sbar_DrawXNum(pos - '9.5 0 0' * sbar_fontsize_y + '0 1 0' * sbar_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, sbar_fontsize_y * 1.5, rgb, 0, 1, sb_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos - '9.5 0 0' * sbar_fontsize_y + '0 1 0' * sbar_fontsize_y, tm.(teamscores[ts_primary]), 6, 0, sbar_fontsize_y * 1.5, rgb, 0, 1, sb_alpha_fg, DRAWFLAG_NORMAL); if(ts_primary != ts_secondary) - Sbar_DrawXNum(pos - '7.5 0 0' * sbar_fontsize_y + '0 2.5 0' * sbar_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, sbar_fontsize_y * 1, rgb, 0, 1, sb_alpha_fg, DRAWFLAG_NORMAL); + HUD_DrawXNum(pos - '7.5 0 0' * sbar_fontsize_y + '0 2.5 0' * sbar_fontsize_y, tm.(teamscores[ts_secondary]), 6, 0, sbar_fontsize_y * 1, rgb, 0, 1, sb_alpha_fg, DRAWFLAG_NORMAL); - pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size); + pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size); } } else @@ -1223,7 +1131,7 @@ void Sbar_DrawScoreboard() if(tm.team == COLOR_SPECTATOR) continue; - pos = Sbar_Scoreboard_MakeTable(pos, tm, rgb, bg_size); + pos = HUD_Scoreboard_MakeTable(pos, tm, rgb, bg_size); } } @@ -1236,13 +1144,13 @@ void Sbar_DrawScoreboard() drawcolorcodedstring(pos, strcat("All-time fastest: ", ftos(race_speedaward_alltimebest), " (", race_speedaward_alltimebest_holder, ")"), sbar_fontsize, sb_alpha_fg, DRAWFLAG_NORMAL); pos_y += 1.25 * sbar_fontsize_y; } - pos = Sbar_DrawScoreboardRankings(pos, pl, rgb, bg_size); + pos = HUD_DrawScoreboardRankings(pos, pl, rgb, bg_size); } else if(cvar("sbar_accuracy") && spectatee_status != -1) { if(teamplay) - pos = Sbar_DrawScoreboardAccuracyStats(pos, GetTeamRGB(myteam), bg_size); + pos = HUD_DrawScoreboardAccuracyStats(pos, GetTeamRGB(myteam), bg_size); else - pos = Sbar_DrawScoreboardAccuracyStats(pos, rgb, bg_size); + pos = HUD_DrawScoreboardAccuracyStats(pos, rgb, bg_size); } tmp = pos + '0 1.5 0' * sbar_fontsize_y; @@ -1255,7 +1163,7 @@ void Sbar_DrawScoreboard() { if(pl.team != COLOR_SPECTATOR) continue; - Sbar_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), specs); + HUD_PrintScoreboardItem(pos, pl, (pl.sv_entnum == player_localentnum - 1), specs); pos_y += 1.25 * sbar_fontsize_y; ++specs; } @@ -1338,7 +1246,7 @@ void Sbar_DrawScoreboard() scoreboard_bottom = pos_y + 2 * sbar_fontsize_y; } -void Sbar_DrawAccuracyStats_Description_Hitscan(vector position) +void HUD_DrawAccuracyStats_Description_Hitscan(vector position) { drawstring(position + '0 3 0' * sbar_fontsize_y, "Shots fired:", sbar_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); drawstring(position + '0 5 0' * sbar_fontsize_y, "Shots hit:", sbar_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1346,7 +1254,7 @@ void Sbar_DrawAccuracyStats_Description_Hitscan(vector position) drawstring(position + '0 9 0' * sbar_fontsize_y, "Shots missed:", sbar_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); } -void Sbar_DrawAccuracyStats_Description_Splash(vector position) +void HUD_DrawAccuracyStats_Description_Splash(vector position) { drawstring(position + '0 3 0' * sbar_fontsize_y, "Maximum damage:", sbar_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); drawstring(position + '0 5 0' * sbar_fontsize_y, "Actual damage:", sbar_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); @@ -1354,7 +1262,7 @@ void Sbar_DrawAccuracyStats_Description_Splash(vector position) drawstring(position + '0 9 0' * sbar_fontsize_y, "Damage wasted:", sbar_fontsize, '1 1 1', hud_alpha_fg, DRAWFLAG_NORMAL); } -void Sbar_DrawAccuracyStats() +void HUD_DrawAccuracyStats() { float i, count_hitscan, count_splash, row; // count is the number of 'colums' float weapon_hit, weapon_damage, weapon_stats; @@ -1398,10 +1306,10 @@ void Sbar_DrawAccuracyStats() } float top_border_hitscan = SCOREBOARD_OFFSET + 55; // position where the hitscan row starts: pixels down the screen - Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * top_border_hitscan); + HUD_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * top_border_hitscan); float top_border_splash = SCOREBOARD_OFFSET + 175; // position where the splash row starts: pixels down the screen - Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash); + HUD_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * top_border_splash); for(i = WEP_FIRST; i <= WEP_LAST; ++i) { @@ -1437,7 +1345,7 @@ void Sbar_DrawAccuracyStats() { count_splash = 0; ++row; - Sbar_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * (top_border_splash + row * (fill_size_y + row_margin))); + HUD_DrawAccuracyStats_Description_Splash('1 0 0' * col_margin + '0 1 0' * (top_border_splash + row * (fill_size_y + row_margin))); } pos_x = left_border + count_splash * (fill_size_x + col_margin); @@ -1487,7 +1395,7 @@ void Sbar_DrawAccuracyStats() { count_hitscan = 0; ++row; - Sbar_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * (top_border_hitscan + row * (fill_size_y + row_margin))); + HUD_DrawAccuracyStats_Description_Hitscan('1 0 0' * col_margin + '0 1 0' * (top_border_hitscan + row * (fill_size_y + row_margin))); } pos_x = left_border + count_hitscan * (fill_size_x + col_margin);