From 3c404128c4669a1f4f190e20a89553677717fc50 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 23 Sep 2016 22:01:44 +0300 Subject: Add missing comments into defines. --- src/actions/actions.cpp | 44 +++++++++++++++++++++++++++----------------- src/actions/actions.h | 5 +++-- src/actions/chat.cpp | 11 ++++++----- src/actions/statusbar.cpp | 4 ++-- 4 files changed, 38 insertions(+), 26 deletions(-) (limited to 'src/actions') diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index cb829445c..8682a8d48 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -25,7 +25,7 @@ #include "game.h" #ifdef USE_OPENGL #include "graphicsmanager.h" -#endif +#endif // USE_OPENGL #include "main.h" #include "spellmanager.h" @@ -74,7 +74,7 @@ #if defined USE_OPENGL #include "render/normalopenglgraphics.h" -#endif +#endif // USE_OPENGL #include "net/adminhandler.h" #include "net/beinghandler.h" @@ -109,8 +109,8 @@ #ifdef ANDROID #ifndef USE_SDL2 #include -#endif -#endif +#endif // USE_OPENGL +#endif // ANDROID #include @@ -608,6 +608,7 @@ impHandler0(itenplz) return true; } #endif // TMWA_SUPPORT + return false; } @@ -631,7 +632,8 @@ impHandler0(magicAttack) localPlayer->magicAttack(); return true; } -#endif +#endif // TMWA_SUPPORT + return false; } @@ -942,13 +944,16 @@ impHandler0(showKeyboard) SDL_StopTextInput(); else SDL_StartTextInput(); -#else +#else // USE_SDL2 + SDL_ANDROID_ToggleScreenKeyboardTextInput(nullptr); -#endif +#endif // USE_SDL2 + return true; -#else +#else // ANDROID + return false; -#endif +#endif // ANDROID } impHandler0(showWindows) @@ -1296,12 +1301,13 @@ impHandler0(dump) check_leaks(); return true; } -#else +#else // DEBUG_DUMP_LEAKS1 + impHandler0(dump) { return true; } -#endif +#endif // DEBUG_DUMP_LEAKS1 impHandler0(serverIgnoreAll) { @@ -1350,9 +1356,10 @@ impHandler(dumpGraphics) #if defined USE_OPENGL str.append(strprintf(",%d", mainGraphics->getOpenGL())); -#else +#else // defined USE_OPENGL + str.append(",0"); -#endif +#endif // defined USE_OPENGL str.append(strprintf(",%f,", static_cast(settings.guiAlpha))) .append(config.getBoolValue("adjustPerfomance") ? "1" : "0") @@ -1395,7 +1402,9 @@ impHandler0(dumpOGL) { #if defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__) NormalOpenGLGraphics::dumpSettings(); -#endif +#endif // defined(USE_OPENGL) && !defined(ANDROID) && + // !defined(__native_client__) + return true; } @@ -1406,12 +1415,13 @@ impHandler(dumpGL) outStringNormal(event.tab, str, str); return true; } -#else +#else // USE_OPENGL + impHandler0(dumpGL) { return true; } -#endif +#endif // USE_OPENGL impHandler(dumpMods) { @@ -1467,7 +1477,7 @@ impHandler0(testSdlFont) } return true; } -#endif +#endif // defined USE_OPENGL && defined DEBUG_SDLFONT impHandler0(createItems) { diff --git a/src/actions/actions.h b/src/actions/actions.h index fd145852d..51c461953 100644 --- a/src/actions/actions.h +++ b/src/actions/actions.h @@ -83,7 +83,7 @@ namespace Actions decHandler(error) #ifndef ENABLE_CILKPLUS __attribute__ ((noreturn)) -#endif +#endif // ENABLE_CILKPLUS ; decHandler(dumpGraphics); decHandler(dumpEnvironment); @@ -93,7 +93,8 @@ namespace Actions decHandler(dumpMods); #if defined USE_OPENGL && defined DEBUG_SDLFONT decHandler(testSdlFont); -#endif +#endif // defined USE_OPENGL && defined DEBUG_SDLFONT + decHandler(createItems); decHandler(createItem); decHandler(uploadConfig); diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp index 0a922daea..150e1fa56 100644 --- a/src/actions/chat.cpp +++ b/src/actions/chat.cpp @@ -40,7 +40,7 @@ #ifdef TMWA_SUPPORT #include "net/tmwa/guildmanager.h" -#endif +#endif // TMWA_SUPPORT #include "resources/iteminfo.h" @@ -96,7 +96,7 @@ static void outString(ChatTab *const tab, { guildManager->chat(str); } -#endif +#endif // TMWA_SUPPORT } break; } @@ -408,9 +408,10 @@ impHandler(guild) guildHandler->invite(args); else if (guildManager) guildManager->invite(args); -#else +#else // TMWA_SUPPORT + guildHandler->invite(args); -#endif +#endif // TMWA_SUPPORT } } else @@ -523,7 +524,7 @@ impHandler(kickGuild) { guildManager->kick(event.args); } -#endif +#endif // TMWA_SUPPORT } } } diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp index 6669f9b34..175beb324 100644 --- a/src/actions/statusbar.cpp +++ b/src/actions/statusbar.cpp @@ -42,8 +42,8 @@ #ifdef ANDROID #ifndef USE_SDL2 #include -#endif -#endif +#endif // USE_SDL2 +#endif // ANDROID #include "debug.h" -- cgit v1.2.3-60-g2f50