From 482d095ffd6193c004856d54df3976d0986b85b5 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Thu, 1 Jul 2010 01:31:18 +0300 Subject: [PATCH] < FruitieX> OMFG < FruitieX> IT COMPILES < FruitieX> 268 warnings < FruitieX> I seriously don't dare run this --- qcsrc/client/View.qc | 4 +-- qcsrc/client/hud.qh | 20 --------------- qcsrc/client/scoreboard.qc | 2 +- qcsrc/common/util.qc | 51 ++++++++++++-------------------------- 4 files changed, 19 insertions(+), 58 deletions(-) diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 1056fd59a..118f63ce2 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -372,7 +372,7 @@ void CSQC_UpdateView(float w, float h) input_angles = warpzone_fixview_cl_viewangles; view_angles = warpzone_fixview_angles; - if(cvar("cl_lockview") || hud_configure) + if(cvar("cl_lockview") || autocvar__hud_configure) { pmove_org = freeze_pmove_org; input_angles = view_angles = freeze_input_angles; @@ -830,7 +830,7 @@ void CSQC_UpdateView(float w, float h) cvar_set("vid_conheight", h0); } - if(hud_configure) + if(autocvar__hud_configure) HUD_Panel_Mouse(); // be safe against triggerbots until everyone has the fixed engine // this call is meant to overwrite the trace globals by something diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index 8a10a5be0..2e55fa164 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -74,26 +74,6 @@ var float panel_accuracy_alreadyvoted_alpha; // ---------------------- // Little help for the poor people who have to make sense of this: Start from the bottom -// we probably want to get rid of GetName in the most places in hud.qc, TODO! -// Get name of specified panel id -#define HUD_Panel_GetName(id) \ -switch(id) { \ - case HUD_PANEL_WEAPONICONS: panel_name = HUD_PANELNAME_WEAPONICONS; break; \ - case HUD_PANEL_INVENTORY: panel_name = HUD_PANELNAME_INVENTORY; break; \ - case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; break; \ - case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; break; \ - case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; break; \ - case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; break; \ - case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; break; \ - case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; break; \ - case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; break; \ - case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; break; \ - case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \ - case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \ - case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \ - case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \ -} - // Get value for panel_bg: if "" fetch default, else use panel_bg_str // comment on last line of macro: // we probably want to see a background in config mode at all times... #define HUD_Panel_GetBg()\ diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc index 256e6ac9b..6bc605719 100644 --- a/qcsrc/client/scoreboard.qc +++ b/qcsrc/client/scoreboard.qc @@ -870,7 +870,7 @@ vector HUD_Scoreboard_MakeTable(vector pos, entity tm, vector rgb, vector bg_siz } float HUD_WouldDrawScoreboard() { - if (hud_configure) + if (autocvar__hud_configure) return 0; else if (scoreboard_showscores) return 1; diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc index 87db7a3f4..a622c320f 100644 --- a/qcsrc/common/util.qc +++ b/qcsrc/common/util.qc @@ -1949,41 +1949,22 @@ float get_model_parameters(string m, float sk) return 1; } +// we probably want to get rid of GetName in the most places in hud.qc, TODO! // Get name of specified panel id #define HUD_Panel_GetName(id) \ switch(id) { \ - case HUD_PANEL_WEAPONICONS: panel_name = HUD_PANELNAME_WEAPONICONS; return; \ - case HUD_PANEL_INVENTORY: panel_name = HUD_PANELNAME_INVENTORY; return; \ - case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; return; \ - case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; return; \ - case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; return; \ - case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; return; \ - case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; return; \ - case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; return; \ - case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; return; \ - case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; return; \ - case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; return; \ - case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; return; \ - case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; return; \ - case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; return; \ -} - -// Update all cvars of given panel -#define HUD_Panel_UpdateCvars(name) \ -panel_enabled = autocvar_hud_##name; \ -panel_pos = autocvar_hud_##name_pos; \ -panel_size = autocvar_hud_##name_size; \ -panel_bg = autocvar_hud_##name_bg; \ -panel_bg_color = autocvar_hud_##name_bg_color; \ -panel_bg_color_team = autocvar_hud_##name_bg_color_team; \ -panel_bg_alpha = autocvar_hud_##name_bg_alpha; \ -panel_bg_border = autocvar_hud_##name_bg_border; \ -panel_bg_padding = autocvar_hud_##name_bg_padding; \ -\ -panel_accuracy_yellow = autocvar_hud_##name_accuracy_yellow; \ -panel_onlycurrent = autocvar_hud_##name_onlycurrent; \ -panel_flip = autocvar_hud_##name_flip; \ -panel_iconalign = autocvar_hud_##name_iconalign; \ -panel_baralign = autocvar_hud_##name_baralign; \ -panel_info_top = autocvar_hud_##name_info_top; \ -panel_alreadyvoted_alpha = autocvar_hud_##name_alreadyvoted_alpha; + case HUD_PANEL_WEAPONICONS: panel_name = HUD_PANELNAME_WEAPONICONS; break; \ + case HUD_PANEL_INVENTORY: panel_name = HUD_PANELNAME_INVENTORY; break; \ + case HUD_PANEL_POWERUPS: panel_name = HUD_PANELNAME_POWERUPS; break; \ + case HUD_PANEL_HEALTHARMOR: panel_name = HUD_PANELNAME_HEALTHARMOR; break; \ + case HUD_PANEL_NOTIFY: panel_name = HUD_PANELNAME_NOTIFY; break; \ + case HUD_PANEL_TIMER: panel_name = HUD_PANELNAME_TIMER; break; \ + case HUD_PANEL_RADAR: panel_name = HUD_PANELNAME_RADAR; break; \ + case HUD_PANEL_SCORE: panel_name = HUD_PANELNAME_SCORE; break; \ + case HUD_PANEL_RACETIMER: panel_name = HUD_PANELNAME_RACETIMER; break; \ + case HUD_PANEL_VOTE: panel_name = HUD_PANELNAME_VOTE; break; \ + case HUD_PANEL_MODICONS: panel_name = HUD_PANELNAME_MODICONS; break; \ + case HUD_PANEL_PRESSEDKEYS: panel_name = HUD_PANELNAME_PRESSEDKEYS; break; \ + case HUD_PANEL_CHAT: panel_name = HUD_PANELNAME_CHAT; break; \ + case HUD_PANEL_ENGINEINFO: panel_name = HUD_PANELNAME_ENGINEINFO; break; \ +} -- 2.39.2