From 8bf25793c4083ea3ff41e50e6877af99e740aa6a Mon Sep 17 00:00:00 2001 From: squeek Date: Mon, 1 Dec 2014 18:37:55 -0800 Subject: [PATCH] Review: Avoid the ternary operator and remove redundant safety when saving base security_* functions --- maps/ff_aardvark.lua | 14 ++++++++++---- maps/ff_destroy.lua | 14 ++++++++++---- maps/ff_openfire.lua | 14 ++++++++++---- maps/ff_schtop.lua | 14 ++++++++++---- maps/ff_shutdown2.lua | 4 ++-- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/maps/ff_aardvark.lua b/maps/ff_aardvark.lua index 4f871c4..f10533a 100644 --- a/maps/ff_aardvark.lua +++ b/maps/ff_aardvark.lua @@ -154,12 +154,18 @@ red_aardvarkresup = aardvarkresup:new({ team = Team.kRed }) red_aardvarksec = red_security_trigger:new() blue_aardvarksec = blue_security_trigger:new() -local security_off_base = security_off or function() end +-- utility function for getting the name of the opposite team, +-- where team is a string, like "red" +local function get_opposite_team(team) + if team == "red" then return "blue" else return "red" end +end + +local security_off_base = security_off function security_off( team ) security_off_base( team ) OpenDoor(team.."_aardvarkdoorhack") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Disable") AddSchedule("secup10"..team, SECURITY_LENGTH - 10, function() @@ -167,12 +173,12 @@ function security_off( team ) end) end -local security_on_base = security_on or function() end +local security_on_base = security_on function security_on( team ) security_on_base( team ) CloseDoor(team.."_aardvarkdoorhack") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Enable") end diff --git a/maps/ff_destroy.lua b/maps/ff_destroy.lua index 2609489..4b0abdd 100644 --- a/maps/ff_destroy.lua +++ b/maps/ff_destroy.lua @@ -65,12 +65,18 @@ red_aardvarkresup = aardvarkresup:new({ team = Team.kRed }) red_aardvarksec = red_security_trigger:new() blue_aardvarksec = blue_security_trigger:new() -local security_off_base = security_off or function() end +-- utility function for getting the name of the opposite team, +-- where team is a string, like "red" +local function get_opposite_team(team) + if team == "red" then return "blue" else return "red" end +end + +local security_off_base = security_off function security_off( team ) security_off_base( team ) OpenDoor(team.."_aardvarkdoorhack") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Disable") AddSchedule("secup10"..team, SECURITY_LENGTH - 10, function() @@ -78,12 +84,12 @@ function security_off( team ) end) end -local security_on_base = security_on or function() end +local security_on_base = security_on function security_on( team ) security_on_base( team ) CloseDoor(team.."_aardvarkdoorhack") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Enable") end diff --git a/maps/ff_openfire.lua b/maps/ff_openfire.lua index 1ce810d..25528d2 100644 --- a/maps/ff_openfire.lua +++ b/maps/ff_openfire.lua @@ -61,12 +61,18 @@ red_aardvarkresup = aardvarkresup:new({ team = Team.kRed }) red_aardvarksec = red_security_trigger:new() blue_aardvarksec = blue_security_trigger:new() -local security_off_base = security_off or function() end +-- utility function for getting the name of the opposite team, +-- where team is a string, like "red" +local function get_opposite_team(team) + if team == "red" then return "blue" else return "red" end +end + +local security_off_base = security_off function security_off( team ) security_off_base( team ) OpenDoor(team.."_aardvarkdoorhack") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Disable") AddSchedule("secup10"..team, SECURITY_LENGTH - 10, function() @@ -74,12 +80,12 @@ function security_off( team ) end) end -local security_on_base = security_on or function() end +local security_on_base = security_on function security_on( team ) security_on_base( team ) CloseDoor(team.."_aardvarkdoorhack") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Enable") end diff --git a/maps/ff_schtop.lua b/maps/ff_schtop.lua index 007f739..7a948af 100644 --- a/maps/ff_schtop.lua +++ b/maps/ff_schtop.lua @@ -127,12 +127,18 @@ blue_dspawn = { validspawn = blue_d_only } red_sec = red_security_trigger:new() blue_sec = blue_security_trigger:new() -local security_off_base = security_off or function() end +-- utility function for getting the name of the opposite team, +-- where team is a string, like "red" +local function get_opposite_team(team) + if team == "red" then return "blue" else return "red" end +end + +local security_off_base = security_off function security_off( team ) security_off_base( team ) OpenDoor(team.."_secdoor") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Disable") AddSchedule("secup10"..team, SECURITY_LENGTH - 10, function() @@ -143,12 +149,12 @@ function security_off( team ) end) end -local security_on_base = security_on or function() end +local security_on_base = security_on function security_on( team ) security_on_base( team ) CloseDoor(team.."_secdoor") - local opposite_team = team == "red" and "blue" or "red" + local opposite_team = get_opposite_team(team) OutputEvent("sec_"..opposite_team.."_slayer", "Enable") end diff --git a/maps/ff_shutdown2.lua b/maps/ff_shutdown2.lua index f7b1368..80ed960 100644 --- a/maps/ff_shutdown2.lua +++ b/maps/ff_shutdown2.lua @@ -13,7 +13,7 @@ SECURITY_LENGTH = 60 red_aardvarksec = red_security_trigger:new() blue_aardvarksec = blue_security_trigger:new() -local security_off_base = security_off or function() end +local security_off_base = security_off function security_off( team ) security_off_base( team ) @@ -24,7 +24,7 @@ function security_off( team ) end) end -local security_on_base = security_on or function() end +local security_on_base = security_on function security_on( team ) security_on_base( team )