| 
                Last change
                  on this file since 11063 was
                  6746,
                  checked in by rgrieder, 16 years ago
           | 
        
        
          | 
               
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. 
 
           | 
        
        
          
            
              - 
                  Property svn:eol-style set to
                  
native
               
             
           | 
        
        | 
            File size:
            676 bytes
           | 
      
      
        
  | Rev | Line |   | 
|---|
| [6363] | 1 | -- InfoPopup.lua | 
|---|
 | 2 |  | 
|---|
| [6746] | 3 | local P = createMenuSheet("InfoPopup") | 
|---|
| [6363] | 4 |  | 
|---|
 | 5 | function P.execute(functionPtr, arguments) | 
|---|
 | 6 |     if functionPtr ~= nil then | 
|---|
 | 7 |         if arguments ~= nil then | 
|---|
 | 8 |             functionPtr(arguments) | 
|---|
 | 9 |         else | 
|---|
 | 10 |             functionPtr() | 
|---|
 | 11 |         end | 
|---|
 | 12 |     end | 
|---|
 | 13 | end | 
|---|
 | 14 |  | 
|---|
| [6746] | 15 | function P.setText(text) | 
|---|
| [6363] | 16 |     winMgr:getWindow("orxonox/InfoPopup_text"):setText( text ) | 
|---|
 | 17 | end | 
|---|
 | 18 |  | 
|---|
 | 19 | function P.setCloseButton(closeButton) | 
|---|
 | 20 |     close = winMgr:getWindow("orxonox/InfoPopup_close") | 
|---|
 | 21 |     close:setVisible(closeButton) | 
|---|
 | 22 |     if(not closeButton) then | 
|---|
 | 23 |         close:deactivate(); | 
|---|
 | 24 |     else | 
|---|
 | 25 |         close:activate(); | 
|---|
 | 26 |     end | 
|---|
 | 27 | end | 
|---|
 | 28 |  | 
|---|
 | 29 | -- events for ingamemenu | 
|---|
 | 30 | function P.close(e) | 
|---|
| [6746] | 31 |     hideMenuSheet(P.name) | 
|---|
| [6363] | 32 | end | 
|---|
 | 33 |  | 
|---|
 | 34 | return P | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.