ASYLUM: Renamed some leftover variables (state -> mainMenu)
git-svn-id: http://asylumengine.googlecode.com/svn/trunk@97 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c
This commit is contained in:
parent
c2fe7353bf
commit
46da88fe15
3 changed files with 6 additions and 6 deletions
|
@ -45,7 +45,7 @@ AsylumEngine::AsylumEngine(OSystem *system, Common::Language language)
|
||||||
|
|
||||||
AsylumEngine::~AsylumEngine() {
|
AsylumEngine::~AsylumEngine() {
|
||||||
//Common::clearAllDebugChannels();
|
//Common::clearAllDebugChannels();
|
||||||
delete _state;
|
delete _mainMenu;
|
||||||
delete _scene;
|
delete _scene;
|
||||||
delete _video;
|
delete _video;
|
||||||
delete _sound;
|
delete _sound;
|
||||||
|
@ -90,7 +90,7 @@ Common::Error AsylumEngine::go() {
|
||||||
|
|
||||||
// DEBUG
|
// DEBUG
|
||||||
// Testing new game state abstraction class
|
// Testing new game state abstraction class
|
||||||
_state = new MainMenu(this);
|
_mainMenu = new MainMenu(this);
|
||||||
|
|
||||||
// TODO: just some scene proof-of-concept
|
// TODO: just some scene proof-of-concept
|
||||||
_scene->load(5);
|
_scene->load(5);
|
||||||
|
@ -139,7 +139,7 @@ void AsylumEngine::checkForEvent(bool doUpdate) {
|
||||||
// Copy background image
|
// Copy background image
|
||||||
_screen->copyBackBufferToScreen();
|
_screen->copyBackBufferToScreen();
|
||||||
}
|
}
|
||||||
_state->handleEvent(&ev, doUpdate);
|
_mainMenu->handleEvent(&ev, doUpdate);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Asylum
|
} // namespace Asylum
|
||||||
|
|
|
@ -66,7 +66,7 @@ private:
|
||||||
Common::RandomSource _rnd;
|
Common::RandomSource _rnd;
|
||||||
|
|
||||||
Scene *_scene;
|
Scene *_scene;
|
||||||
MainMenu *_state;
|
MainMenu *_mainMenu;
|
||||||
Screen *_screen;
|
Screen *_screen;
|
||||||
Sound *_sound;
|
Sound *_sound;
|
||||||
Video *_video;
|
Video *_video;
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef ASYLUM_STATE_H_
|
#ifndef ASYLUM_MENU_H_
|
||||||
#define ASYLUM_STATE_H_
|
#define ASYLUM_MENU_H_
|
||||||
|
|
||||||
#include "common/events.h"
|
#include "common/events.h"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue