diff options
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/game.cpp b/src/game.cpp index acf2d5a2..a9199817 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -206,9 +206,7 @@ static void destroyGuiWindows() Game *Game::mInstance = nullptr; Game::Game(): - mLastTarget(ActorSprite::UNKNOWN), - mDisconnected(false), - mCurrentMap(nullptr) + mLastTarget(ActorSprite::UNKNOWN) { assert(!mInstance); mInstance = this; @@ -946,8 +944,8 @@ void Game::changeMap(const std::string &mapPath) newMap->initializeParticleEffects(particleEngine); // Start playing new music file when necessary - std::string oldMusic = mCurrentMap ? mCurrentMap->getMusicFile() : ""; - std::string newMusic = newMap ? newMap->getMusicFile() : ""; + std::string oldMusic = mCurrentMap ? mCurrentMap->getMusicFile() : std::string(); + std::string newMusic = newMap ? newMap->getMusicFile() : std::string(); if (newMusic != oldMusic) { if (newMusic.empty()) |