Changeset 6595 for code/branches/gamestates2/data/gui/scripts/InfoPopup.lua

Timestamp:

Mar 22, 2010, 2:47:10 PM (14 years ago)

Author:

rgrieder

Message:

Merged remaining revisions from gamestate to gamestates2.

Location:

code/branches/gamestates2

Files:

• . (modified) (1 prop)
• data/gui/scripts/InfoPopup.lua (modified) (4 diffs)

code/branches/gamestates2/data/gui/scripts/InfoPopup.lua

@@ -2 +2 @@
 
 BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InfoPopup")
 
 if _REQUIREDNAME == nil then
@@ -8 +8 @@
 else
     _G[_REQUIREDNAME] = P
-end
-
-P.filename = "InfoPopup"
-P.layoutString = "InfoPopup.layout"
-
-function P:init()
 end
 
@@ -26 +20 @@
 end
 
-function P.setText( text )
+function P.setText(text)
     winMgr:getWindow("orxonox/InfoPopup_text"):setText( text )
 end
@@ -42 +36 @@
 -- events for ingamemenu
 function P.close(e)
-    hideGUI("InfoPopup")
+    hideGUI(P.filename)
 end