summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-14 23:38:39 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-14 23:40:46 +0300
commit015515ba20b66195840afd1c0c074f0729995a2d (patch)
treec1aaf12666cc031dd15e02b74dd0c1a5cc57a74b /src/game.cpp
parent1f67b67fcd391d5658e46f40756720199bd0004b (diff)
downloadplus-015515ba20b66195840afd1c0c074f0729995a2d.tar.gz
plus-015515ba20b66195840afd1c0c074f0729995a2d.tar.bz2
plus-015515ba20b66195840afd1c0c074f0729995a2d.tar.xz
plus-015515ba20b66195840afd1c0c074f0729995a2d.zip
Add some android fixes.
Partial impliment option to enable/disable mumble support.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp8
1 files changed, 8 insertions, 0 deletions
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);