X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2Fgame.cpp;h=3b7a34b8c785f8c2c5f0a1f04257e96d694b7d43;hb=033c553524d4a0407f6fabd0bcebf1d460519cf5;hp=26fd83bf768850a88a3a11b37d98dc7e47c2b72c;hpb=68b2316d5438e8ebaaa7f7fdaa8292a8a290e14d;p=physics.git diff --git a/src/game.cpp b/src/game.cpp index 26fd83b..3b7a34b 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2008 Patrik Gornicz, Gornicz_P (at) hotmail (dot) com. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include "game.h" #include "debug.h" @@ -24,6 +41,11 @@ Running* running; Paused* paused; CreatingPolygon* creating_Polygon; +// true if the top state requested itself to be poped +bool pop_State; +// pointer to a state wishing to be added +GameState* push_State; + /// ***** Public Methods ***** @@ -33,6 +55,9 @@ void game::init() paused = new Paused(); creating_Polygon = new CreatingPolygon(); + pop_State = false; + push_State = NULL; + // create starting entities creator::init(); @@ -58,13 +83,28 @@ void game::clean() void game::input() { + if(running->pushMe()) + push_State = running; + + if(paused->pushMe()) + push_State = paused; + + if(creating_Polygon->pushMe()) + push_State = creating_Polygon; + + int last = active_States.size() -1; for( int i = 0; i <= last; i++ ) { if( i == last ) - active_States[i]->handleInput(true); + { + if(active_States[i]->popMe()) + pop_State = true; + else + active_States[i]->handleInput(true); + } else active_States[i]->handleInput(false); } @@ -72,6 +112,21 @@ void game::input() void game::update(float time_step) { + if(push_State != NULL) + { + // don't want to pop and push same state, pop wins arbitrary + if(!pop_State) + active_States.push_back(push_State); + + push_State = NULL; + } + + if(pop_State) + { + active_States.pop_back(); + pop_State = false; + } + int last = active_States.size() -1; for( int i = 0; i <= last;