From aef322f20e0900621bc7c31823287475f2b8e154 Mon Sep 17 00:00:00 2001 From: terencehill Date: Mon, 18 Mar 2013 16:16:04 +0100 Subject: [PATCH] Make it compile --- qcsrc/client/hud.qc | 11 ++++++----- qcsrc/client/hud.qh | 1 - qcsrc/client/waypointsprites.qc | 4 ++-- qcsrc/server/t_items.qc | 2 -- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 067743a04..3067e8aa8 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -4383,8 +4383,8 @@ string GetItemsTimePicture(float i) void DrawItemsTimeItem(vector myPos, vector mySize, float ar, float itemcode) { - float t; - vector color; + float t = 0; + vector color = '0 0 0'; float picalpha; if(ItemsTime_time[itemcode] <= time) { @@ -4475,7 +4475,7 @@ void HUD_ItemsTime(void) } float i; - float count; + float count = 0; if (autocvar_hud_panel_itemstime_showspawned) for (i = 0; i < ITEMSTIME_MAXITEMS; ++i) count += (ItemsTime_time[i] > time || (ItemsTime_time[i] != -1 && ItemsTime_time[i] <= time)); @@ -4497,7 +4497,7 @@ void HUD_ItemsTime(void) mySize -= '2 2 0' * panel_bg_padding; } - float rows, columns, row, column; + float rows, columns; float ar = max(2, autocvar_hud_panel_itemstime_ratio) + 1; rows = mySize_y/mySize_x; rows = bound(1, floor((sqrt(4 * ar * rows * count + rows * rows) + rows + 0.5) / 2), count); @@ -4507,7 +4507,7 @@ void HUD_ItemsTime(void) vector itemstime_size; itemstime_size = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows); - local noref vector offset; // fteqcc sucks + vector offset = '0 0 0'; float newSize; if(autocvar_hud_panel_itemstime_size_dinamic) { @@ -4553,6 +4553,7 @@ void HUD_ItemsTime(void) HUD_Panel_DrawBg(1); + float row = 0, column = 0; for (i = 0; i < ITEMSTIME_MAXITEMS; ++i) { if (ItemsTime_time[i] == -1) continue; diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh index db27a488f..1300a13b9 100644 --- a/qcsrc/client/hud.qh +++ b/qcsrc/client/hud.qh @@ -3,7 +3,6 @@ string hud_panelorder_prev; float hud_draw_maximized; float hud_panel_radar_maximized; -float hud_panel_itemstime; vector mousepos; vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click) diff --git a/qcsrc/client/waypointsprites.qc b/qcsrc/client/waypointsprites.qc index 366f6152d..87341be96 100644 --- a/qcsrc/client/waypointsprites.qc +++ b/qcsrc/client/waypointsprites.qc @@ -419,8 +419,8 @@ void Draw_WaypointSprite() switch(self.rule) { case SPRITERULE_SPECTATOR: - if not(autocvar_g_waypointsprite_itemstime == 1 && t == COLOR_SPECTATOR + 1 - || autocvar_g_waypointsprite_itemstime == 2 && (t == COLOR_SPECTATOR + 1 || warmup_stage)) + if not(autocvar_g_waypointsprite_itemstime == 1 && t == NUM_SPECTATOR + 1 + || autocvar_g_waypointsprite_itemstime == 2 && (t == NUM_SPECTATOR + 1 || warmup_stage)) return; spriteimage = self.netname; break; diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index 11f81b1d6..766c4ae1c 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -592,8 +592,6 @@ void Item_ItemsTime_GetForAll() void Item_Respawn (void) { - float t; - entity head; Item_Show(self, 1); if(!g_minstagib && self.items == IT_STRENGTH) sound (self, CH_TRIGGER, "misc/strength_respawn.wav", VOL_BASE, ATTN_NORM); // play respawn sound -- 2.39.2