summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-23 22:01:44 +0300
committerAndrei Karas <akaras@inbox.ru>2016-09-23 22:01:44 +0300
commit3c404128c4669a1f4f190e20a89553677717fc50 (patch)
tree2db4e5031089c800c4e00fd6244e578f44a7c910 /src/game.cpp
parent89b267d6d73bbc59f7c313b8a22b97fbb27f99a8 (diff)
downloadplus-3c404128c4669a1f4f190e20a89553677717fc50.tar.gz
plus-3c404128c4669a1f4f190e20a89553677717fc50.tar.bz2
plus-3c404128c4669a1f4f190e20a89553677717fc50.tar.xz
plus-3c404128c4669a1f4f190e20a89553677717fc50.zip
Add missing comments into defines.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp35
1 files changed, 19 insertions, 16 deletions
diff --git a/src/game.cpp b/src/game.cpp
index d9ad1cb47..56e86ba6d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -134,16 +134,16 @@
#ifdef TMWA_SUPPORT
#include "net/tmwa/guildmanager.h"
-#endif
+#endif // TMWA_SUPPORT
#ifdef USE_MUMBLE
#include "mumblemanager.h"
-#endif
+#endif // USE_MUMBLE
#ifdef WIN32
#include <sys/time.h>
#undef ERROR
-#endif
+#endif // WIN32
#include "debug.h"
@@ -162,7 +162,8 @@ static void initEngines()
effectManager = new EffectManager;
#ifdef TMWA_SUPPORT
GuildManager::init();
-#endif
+#endif // TMWA_SUPPORT
+
crazyMoves = new CrazyMoves;
particleEngine = new ParticleEngine;
@@ -320,7 +321,7 @@ static void destroyGuiWindows()
#ifdef TMWA_SUPPORT
if (guildManager)
guildManager->clear();
-#endif
+#endif // TMWA_SUPPORT
delete2(windowMenu);
delete2(localChatTab) // Need to do this first, so it can remove itself
@@ -332,7 +333,8 @@ static void destroyGuiWindows()
#ifdef TMWA_SUPPORT
if (guildManager && GuildManager::getEnableGuildBot())
guildManager->reload();
-#endif
+#endif // TMWA_SUPPORT
+
logger->log("start deleting");
delete2(emoteWindow);
delete2(chatWindow)
@@ -413,7 +415,7 @@ Game::Game() :
#ifdef USE_OPENGL
MapReader::loadEmptyAtlas();
-#endif
+#endif // USE_OPENGL
initEngines();
@@ -433,7 +435,7 @@ Game::Game() :
#ifdef TMWA_SUPPORT
if (guildManager && GuildManager::getEnableGuildBot())
guildManager->requestGuildInfo();
-#endif
+#endif // TMWA_SUPPORT
settings.disableLoggingInGame = config.getBoolValue(
"disableLoggingInGame");
@@ -443,7 +445,7 @@ Game::~Game()
{
#ifdef USE_OPENGL
MapReader::unloadEmptyAtlas();
-#endif
+#endif // USE_OPENGL
settings.disableLoggingInGame = false;
touchManager.setInGame(false);
@@ -465,10 +467,11 @@ Game::~Game()
delete2(mCurrentMap)
#ifdef TMWA_SUPPORT
delete2(guildManager)
-#endif
+#endif // TMWA_SUPPORT
#ifdef USE_MUMBLE
delete2(mumbleManager)
-#endif
+#endif // USE_MUMBLE
+
delete2(crazyMoves);
Being::clearCache();
@@ -576,7 +579,8 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot)
cutFirst(nacScreenshotlDir, "/persistent");
naclPostMessage("copy-from-persistent", nacScreenshotlDir);
logger->log("nacl screenshot path: " + nacScreenshotlDir);
-#endif
+#endif // __native_client__
+
if (success)
{
if (localChatTab)
@@ -658,11 +662,10 @@ void Game::slowLogic()
#ifdef TMWA_SUPPORT
if (shopWindow)
cilk_spawn shopWindow->updateTimes();
-#endif
-#ifdef TMWA_SUPPORT
if (guildManager)
guildManager->slowLogic();
-#endif
+#endif // TMWA_SUPPORT
+
if (skillDialog)
cilk_spawn skillDialog->slowLogic();
@@ -1104,7 +1107,7 @@ void Game::changeMap(const std::string &mapPath)
#ifdef USE_MUMBLE
if (mumbleManager)
mumbleManager->setMap(mapPath);
-#endif
+#endif // USE_MUMBLE
if (localPlayer)
localPlayer->recreateItemParticles();