| Last change
                  on this file since 7357 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:
            1.2 KB | 
      
      
        
  | Line |  | 
|---|
| 1 | /* | 
|---|
| 2 | *   ORXONOX - the hottest 3D action shooter ever to exist | 
|---|
| 3 | *                    > www.orxonox.net < | 
|---|
| 4 | * | 
|---|
| 5 | * | 
|---|
| 6 | *   License notice: | 
|---|
| 7 | * | 
|---|
| 8 | *   This program is free software; you can redistribute it and/or | 
|---|
| 9 | *   modify it under the terms of the GNU General Public License | 
|---|
| 10 | *   as published by the Free Software Foundation; either version 2 | 
|---|
| 11 | *   of the License, or (at your option) any later version. | 
|---|
| 12 | * | 
|---|
| 13 | *   This program is distributed in the hope that it will be useful, | 
|---|
| 14 | *   but WITHOUT ANY WARRANTY; without even the implied warranty of | 
|---|
| 15 | *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
|---|
| 16 | *   GNU General Public License for more details. | 
|---|
| 17 | * | 
|---|
| 18 | *   You should have received a copy of the GNU General Public License | 
|---|
| 19 | *   along with this program; if not, write to the Free Software | 
|---|
| 20 | *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. | 
|---|
| 21 | * | 
|---|
| 22 | *   Author: | 
|---|
| 23 | *      Reto Grieder | 
|---|
| 24 | *   Co-authors: | 
|---|
| 25 | *      ... | 
|---|
| 26 | * | 
|---|
| 27 | */ | 
|---|
| 28 |  | 
|---|
| 29 | #ifndef _TriBool_H__ | 
|---|
| 30 | #define _TriBool_H__ | 
|---|
| 31 |  | 
|---|
| 32 | #include "UtilPrereqs.h" | 
|---|
| 33 |  | 
|---|
| 34 | // tolua_begin | 
|---|
| 35 | namespace orxonox | 
|---|
| 36 | { | 
|---|
| 37 | namespace TriBool | 
|---|
| 38 | { | 
|---|
| 39 | enum Value | 
|---|
| 40 | { | 
|---|
| 41 | False    =  0, | 
|---|
| 42 | True     =  1, | 
|---|
| 43 | Dontcare =  2 | 
|---|
| 44 | }; | 
|---|
| 45 | } | 
|---|
| 46 | } | 
|---|
| 47 | // tolua_end | 
|---|
| 48 |  | 
|---|
| 49 | #endif /* _TriBool_H__ */ | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.