From 015515ba20b66195840afd1c0c074f0729995a2d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 14 Oct 2012 23:38:39 +0300 Subject: Add some android fixes. Partial impliment option to enable/disable mumble support. --- src/game.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index c86af69a9..4aad0eec5 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -22,6 +22,8 @@ #include "game.h" +#include "main.h" + #include "actorspritemanager.h" #include "auctionmanager.h" #include "animatedsprite.h" @@ -140,7 +142,9 @@ WindowMenu *windowMenu = nullptr; ActorSpriteManager *actorSpriteManager = nullptr; ChannelManager *channelManager = nullptr; CommandHandler *commandHandler = nullptr; +#ifdef USE_MUMBLE MumbleManager *mumbleManager = nullptr; +#endif Particle *particleEngine = nullptr; EffectManager *effectManager = nullptr; SpellManager *spellManager = nullptr; @@ -459,7 +463,9 @@ Game::~Game() del_0(spellShortcut) del_0(auctionManager) del_0(guildManager) + #ifdef USE_MUMBLE del_0(mumbleManager) + #endif Being::clearCache(); @@ -1041,8 +1047,10 @@ void Game::changeMap(const std::string &mapPath) mCurrentMap = newMap; // mCurrentMap = 0; + #ifdef USE_MUMBLE if (mumbleManager) mumbleManager->setMap(mapPath); + #endif DepricatedEvent event(EVENT_MAPLOADED); event.setString("mapPath", mapPath); DepricatedEvent::trigger(CHANNEL_GAME, event); -- cgit v1.2.3-60-g2f50