Changeset 6746 for code/trunk/data/gui/scripts/DecisionPopup.lua

Timestamp:

Apr 16, 2010, 2:50:16 PM (15 years ago)

Author:

rgrieder

Message:

Merged gamestates2 branch back to trunk.
This brings in some heavy changes in the GUI framework.
It should also fix problems with triggered asserts in the InputManager.

Note: PickupInventory does not seem to work —> Segfault when showing because before, the owner in GUIOverlay::setGUIName is already NULL.
I haven't tested it before, so I can't tell whether it's my changes.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/gui/scripts/DecisionPopup.lua (modified) (3 diffs)

code/trunk/data/gui/scripts/DecisionPopup.lua

@@ -1 +1 @@
 -- DecisionPopup.lua
 
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
-if _REQUIREDNAME == nil then
-    DecisionPopup = P
-else
-    _G[_REQUIREDNAME] = P
-end
-
-P.filename = "DecisionPopup"
-P.layoutString = "DecisionPopup.layout"
-
-function P:init()
-end
+local P = createMenuSheet("DecisionPopup")
 
 function P.setCallback(functionPtr)
@@ -28 +16 @@
         P.functionPtr(true)
     end
-    hideGUI("DecisionPopup")
+    hideMenuSheet("DecisionPopup")
 end
 
@@ -35 +23 @@
         P.functionPtr(false)
     end
-    hideGUI("DecisionPopup")
+    hideMenuSheet("DecisionPopup")
 end