Also move close_settings_gui() up.

narc0tiq · Sep 9, 2015 · 737a78a · 737a78a
1 parent 97b8b3d
commit 737a78a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/value_sensors/day_time.lua b/value_sensors/day_time.lua
@@ -32,16 +32,6 @@ function sensor:get_line()
 end
 
 
-function sensor:close_settings_gui(player_index)
-    local player = game.get_player(player_index)
-    local root_name = self:settings_root_name()
-
-    player.gui.center[root_name].destroy()
-
-    if self.settings_gui_closed then self.settings_gui_closed(player_index) end
-end
-
-
 function sensor:settings_gui(player_index)
     local player = game.get_player(player_index)
     local sensor_settings = global.evogui[player.name].sensor_settings[self.name]

diff --git a/value_sensors/player_locations.lua b/value_sensors/player_locations.lua
@@ -3,6 +3,7 @@ require "template"
 if not evogui.on_click then evogui.on_click = {} end
 local sensor = ValueSensor.new("player_locations")
 
+
 function sensor:create_ui(owner)
     if owner[self.name] == nil then
         local root = owner.add{type="flow",
@@ -16,16 +17,6 @@ function sensor:create_ui(owner)
 end
 
 
-function sensor:close_settings_gui(player_index)
-    local player = game.get_player(player_index)
-    local root_name = self:settings_root_name()
-
-    player.gui.center[root_name].destroy()
-
-    if self.settings_gui_closed then self.settings_gui_closed(player_index) end
-end
-
-
 function sensor:settings_gui(player_index)
     local player = game.get_player(player_index)
     local sensor_settings = global.evogui[player.name].sensor_settings[self.name]

diff --git a/value_sensors/template.lua b/value_sensors/template.lua
@@ -40,6 +40,15 @@ function ValueSensor.new(name)
         return self.name.."_settings"
     end
 
+    function sensor:close_settings_gui(player_index)
+        local player = game.get_player(player_index)
+        local root_name = self:settings_root_name()
+
+        player.gui.center[root_name].destroy()
+
+        if self.settings_gui_closed then self.settings_gui_closed(player_index) end
+    end
+
     function sensor:make_on_click_checkbox_handler(setting_name)
         local sensor_name = self.name