diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 00:03:44 +0200 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-04-09 17:54:12 +0200 |
commit | 30d4b0adf4f17f05d1d62fc3428c896ef1079b6b (patch) | |
tree | acc6dab5d6894a949df3ab4d913ef72a1b1ebdca /src/game.cpp | |
parent | b499cf0c03f2589d36a1df14c81530347243940a (diff) | |
download | mana-client-30d4b0adf4f17f05d1d62fc3428c896ef1079b6b.tar.gz mana-client-30d4b0adf4f17f05d1d62fc3428c896ef1079b6b.tar.bz2 mana-client-30d4b0adf4f17f05d1d62fc3428c896ef1079b6b.tar.xz mana-client-30d4b0adf4f17f05d1d62fc3428c896ef1079b6b.zip |
Moved Events to Mana::Event::Type
Acked-by: Jared Adams
Diffstat (limited to 'src/game.cpp')
-rw-r--r-- | src/game.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/game.cpp b/src/game.cpp index 18e72b6d..787eadc9 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -128,7 +128,7 @@ ChatTab *localChatTab = NULL; */ static void initEngines() { - Mana::Event::trigger(CHANNEL_GAME, EVENT_ENGINESINITALIZING); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::EnginesInitializing); actorSpriteManager = new ActorSpriteManager; commandHandler = new CommandHandler; @@ -138,7 +138,7 @@ static void initEngines() particleEngine = new Particle(NULL); particleEngine->setupEngine(); - Mana::Event::trigger(CHANNEL_GAME, EVENT_ENGINESINITALIZED); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::EnginesInitialized); } /** @@ -146,7 +146,7 @@ static void initEngines() */ static void createGuiWindows() { - Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSLOADING); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::GuiWindowsLoading); setupWindow->clearWindowsForReset(); @@ -183,7 +183,7 @@ static void createGuiWindows() NpcDialog::setup(); - Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSLOADED); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::GuiWindowsLoaded); } #define del_0(X) { delete X; X = 0; } @@ -193,7 +193,7 @@ static void createGuiWindows() */ static void destroyGuiWindows() { - Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSUNLOADING); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::GuiWindowsUnloading); del_0(localChatTab) // Need to do this first, so it can remove itself del_0(chatWindow) @@ -212,9 +212,9 @@ static void destroyGuiWindows() del_0(specialsWindow) del_0(socialWindow) - Mana::Event::trigger(CHANNEL_NPC, EVENT_CLOSEALL); // Cleanup remaining NPC dialogs + Mana::Event::trigger(CHANNEL_NPC, Mana::Event::CloseAll); // Cleanup remaining NPC dialogs - Mana::Event::trigger(CHANNEL_GAME, EVENT_GUIWINDOWSUNLOADED); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::GuiWindowsUnloaded); } Game *Game::mInstance = 0; @@ -266,12 +266,12 @@ Game::Game(): setupWindow->setInGame(true); - Mana::Event::trigger(CHANNEL_GAME, EVENT_CONSTRUCTED); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::Constructed); } Game::~Game() { - Mana::Event::trigger(CHANNEL_GAME, EVENT_DESTRUCTING); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::Destructing); delete mWindowMenu; @@ -289,7 +289,7 @@ Game::~Game() mInstance = 0; - Mana::Event::trigger(CHANNEL_GAME, EVENT_DESTRUCTED); + Mana::Event::trigger(CHANNEL_GAME, Mana::Event::Destructed); } static bool saveScreenshot() @@ -990,7 +990,7 @@ void Game::changeMap(const std::string &mapPath) delete mCurrentMap; mCurrentMap = newMap; - Mana::Event event(EVENT_MAPLOADED); + Mana::Event event(Mana::Event::MapLoaded); event.setString("mapPath", mapPath); event.trigger(CHANNEL_GAME); } |