|
Last change
on this file since 2845 was
2844,
checked in by rgrieder, 16 years ago
|
|
Implemented new GameState concept. It doesn't differ that much from the old one, but there's still lots of changes.
The most important change is that one GameState can occur multiple times in the hierarchy.
Short log:
- No RootGameState anymore. Simply the highest is root.
- Game::requestGameState(name) can refer to the parent, grandparent, great-grandparent, etc. or one of the children.
- Requested states are saved. So if you select "level", the next request (even right after the call) will be relative to "level"
- Game::popState() will simply unload the current one
- Re added Main.cc again because Game as well as GameState have been moved to the core
- Adapted all GameStates to the new system
Things should already work, except for network support because standalone only works with a little hack.
We can now start creating a better hierarchy.
|
-
Property svn:eol-style set to
native
|
|
File size:
1.4 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 _GSGUI_H__ |
|---|
| 30 | #define _GSGUI_H__ |
|---|
| 31 | |
|---|
| 32 | #include "OrxonoxPrereqs.h" |
|---|
| 33 | #include "core/GameState.h" |
|---|
| 34 | |
|---|
| 35 | namespace orxonox |
|---|
| 36 | { |
|---|
| 37 | class _OrxonoxExport GSGUI : public GameState |
|---|
| 38 | { |
|---|
| 39 | public: |
|---|
| 40 | GSGUI(const std::string& name); |
|---|
| 41 | ~GSGUI(); |
|---|
| 42 | |
|---|
| 43 | void activate(); |
|---|
| 44 | void deactivate(); |
|---|
| 45 | void update(const Clock& time); |
|---|
| 46 | |
|---|
| 47 | void startGame(); |
|---|
| 48 | |
|---|
| 49 | private: |
|---|
| 50 | GUIManager* guiManager_; |
|---|
| 51 | |
|---|
| 52 | // console commands |
|---|
| 53 | ConsoleCommand* ccStartGame_; |
|---|
| 54 | }; |
|---|
| 55 | } |
|---|
| 56 | |
|---|
| 57 | #endif /* _GSGUI_H__ */ |
|---|
Note: See
TracBrowser
for help on using the repository browser.
