From 3dbf931bbeef8abab39dfa09064728ea6944d8ca Mon Sep 17 00:00:00 2001 From: squeek Date: Fri, 27 Mar 2015 11:14:21 -0700 Subject: [PATCH] Fix various HUD timers getting added with time + 1 --- maps/includes/base_adzone.lua | 4 ++-- maps/includes/base_id.lua | 8 ++++---- maps/includes/base_id_new.lua | 8 ++++---- maps/includes/base_teamplay.lua | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/maps/includes/base_adzone.lua b/maps/includes/base_adzone.lua index b7e5764..9e79e30 100644 --- a/maps/includes/base_adzone.lua +++ b/maps/includes/base_adzone.lua @@ -568,7 +568,7 @@ function update_zone_text( player ) if not zone_status then AddHudText( player, "defender_points_text", "#FF_Defenders", text_x, text_line1y, text_align ) AddHudText( player, "defender_points_text2", "#ADZ_ScoreNotice", text_x, text_line2y, text_align ) - AddHudTimer( player, "defender_points_timer", current_timer +1, -1, text_x, text_line3y, text_align ) + AddHudTimer( player, "defender_points_timer", current_timer, -1, text_x, text_line3y, text_align ) else AddHudText( player, "attackers_in_text", "#FF_Attackers", text_x, text_line1y, text_align ) AddHudText( player, "attackers_in_text2", "#ADZ_AreIn", text_x, text_line2y, text_align ) @@ -596,7 +596,7 @@ function update_zone_text( player ) if not zone_status then AddHudTextToAll( "defender_points_text", "#FF_Defenders", text_x, text_line1y, text_align ) AddHudTextToAll( "defender_points_text2", "#ADZ_ScoreNotice", text_x, text_line2y, text_align ) - AddHudTimerToAll( "defender_points_timer", current_timer +1, -1, text_x, text_line3y, text_align ) + AddHudTimerToAll( "defender_points_timer", current_timer, -1, text_x, text_line3y, text_align ) else AddHudTextToAll( "attackers_in_text", "#FF_Attackers", text_x, text_line1y, text_align ) AddHudTextToAll( "attackers_in_text2", "#ADZ_AreIn", text_x, text_line2y, text_align ) diff --git a/maps/includes/base_id.lua b/maps/includes/base_id.lua index 5d8e9a8..2e93001 100644 --- a/maps/includes/base_id.lua +++ b/maps/includes/base_id.lua @@ -785,7 +785,7 @@ function flaginfo( player_entity ) else AddHudTextToAll("flag_return_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0) end - AddHudTimer(player, "flag_return_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) + AddHudTimer(player, "flag_return_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) AddHudIcon(player, hudstatusicondropped, ( "cp_flag_d" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) elseif _G[flagname].status == 0 then AddHudText(player, "flag_athome", "#AD_FlagIsAt", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0) @@ -802,7 +802,7 @@ function flaginfo( player_entity ) else AddHudText(player, "flag_tobase_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0) end - AddHudTimer(player, "flag_tobase_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) + AddHudTimer(player, "flag_tobase_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) AddHudIcon(player, hudstatusicontobase, ( "cp_flag_h" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) end @@ -891,7 +891,7 @@ function update_hud() else AddHudTextToAll("flag_return_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0) end - AddHudTimerToAll("flag_return_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) + AddHudTimerToAll("flag_return_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) AddHudIconToAll( hudstatusicondropped, ( "cp_flag_d" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) elseif _G[flagname].status == 0 then AddHudTextToAll("flag_athome", "#AD_FlagIsAt", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0) @@ -908,7 +908,7 @@ function update_hud() else AddHudTextToAll("flag_tobase_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0) end - AddHudTimerToAll("flag_tobase_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) + AddHudTimerToAll("flag_tobase_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign) AddHudIconToAll(hudstatusicontobase, ( "cp_flag_h" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) end diff --git a/maps/includes/base_id_new.lua b/maps/includes/base_id_new.lua index 2b9fa47..d9dfdd0 100644 --- a/maps/includes/base_id_new.lua +++ b/maps/includes/base_id_new.lua @@ -1026,7 +1026,7 @@ function flaginfo( player_entity ) else AddHudTextToAll("flag_return_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0, 2) end - AddHudTimer(player, "flag_return_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) + AddHudTimer(player, "flag_return_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) AddHudIcon(player, hudstatusicondropped, ( "cp_flag_d" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) elseif _G[flagname].status == 0 then AddHudText(player, "flag_athome", "#AD_FlagIsAt", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0, 2) @@ -1043,7 +1043,7 @@ function flaginfo( player_entity ) else AddHudText(player, "flag_tobase_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0, 2) end - AddHudTimer(player, "flag_tobase_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) + AddHudTimer(player, "flag_tobase_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) AddHudIcon(player, hudstatusicontobase, ( "cp_flag_h" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) end @@ -1140,7 +1140,7 @@ function update_hud() else AddHudTextToAll("flag_return_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0, 2) end - AddHudTimerToAll("flag_return_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) + AddHudTimerToAll("flag_return_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) AddHudIconToAll( hudstatusicondropped, ( "cp_flag_d" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) elseif _G[flagname].status == 0 then AddHudTextToAll("flag_athome", "#AD_FlagIsAt", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0, 2) @@ -1157,7 +1157,7 @@ function update_hud() else AddHudTextToAll("flag_tobase_text", "#AD_FlagReturnBase", text_hudstatusx, text_hudstatusy, text_hudstatusalign, 0, 2) end - AddHudTimerToAll("flag_tobase_timer", current_timer + 1, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) + AddHudTimerToAll("flag_tobase_timer", current_timer, -1, text_hudstatusx, text_hudstatusy+8, text_hudstatusalign, 0, 3) AddHudIconToAll(hudstatusicontobase, ( "cp_flag_h" ), flag_hudstatusiconx, flag_hudstatusicony, flag_hudstatusiconw, flag_hudstatusiconh, flag_hudstatusiconalign ) end diff --git a/maps/includes/base_teamplay.lua b/maps/includes/base_teamplay.lua index bf36bd2..a3b2d2e 100644 --- a/maps/includes/base_teamplay.lua +++ b/maps/includes/base_teamplay.lua @@ -757,7 +757,7 @@ function baseflag:refreshStatusIcons(flagname) AddHudIconToAll( self.hudstatusiconcarried, ( flagname .. "_status" ), self.hudstatusiconx, self.hudstatusicony, self.hudstatusiconw, self.hudstatusiconh, self.hudstatusiconalign ) elseif self.status == 2 then AddHudTextToAll( flagname .. "location", self.droppedlocation, self.hudstatusiconx + 24, (self.hudstatusicony + self.hudstatusiconh), self.hudstatusiconalign ) - AddHudTimerToAll( flagname .. "timer", FLAG_RETURN_TIME+1, -1, self.hudstatusiconx, (self.hudstatusicony + self.hudstatusiconh), self.hudstatusiconalign ) + AddHudTimerToAll( flagname .. "timer", FLAG_RETURN_TIME, -1, self.hudstatusiconx, (self.hudstatusicony + self.hudstatusiconh), self.hudstatusiconalign ) AddHudIconToAll( self.hudstatusicondropped, ( flagname .. "_status" ), self.hudstatusiconx, self.hudstatusicony, self.hudstatusiconw, self.hudstatusiconh, self.hudstatusiconalign ) else AddHudIconToAll( self.hudstatusiconhome, ( flagname .. "_status" ), self.hudstatusiconx, self.hudstatusicony, self.hudstatusiconw, self.hudstatusiconh, self.hudstatusiconalign )