diff options
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/game.cpp b/src/game.cpp index 4e3c399cd..d9df74ddc 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1,10 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2004-2009 The Mana World Development Team * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2019 The ManaPlus Developers + * Copyright (C) 2011-2020 The ManaPlus Developers + * Copyright (C) 2020-2025 The ManaVerse Developers * - * This file is part of The ManaPlus Client. + * This file is part of The ManaVerse Client. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -127,6 +128,7 @@ #include "utils/gettext.h" #include "utils/perfstat.h" #include "utils/pnglib.h" +#include "utils/performance.h" #include "utils/sdlcheckutils.h" #include "utils/timer.h" @@ -145,10 +147,10 @@ #include "mumblemanager.h" #endif // USE_MUMBLE -#ifdef WIN32 +#ifdef _WIN32 #include <sys/time.h> #undef ERROR -#endif // WIN32 +#endif // _WIN32 #include <fstream> @@ -293,8 +295,6 @@ static void createGuiWindows() localChatTab = new ChatTab(chatWindow, _("General"), GENERAL_CHANNEL, "#General", ChatTabType::INPUT); localChatTab->setAllowHighlight(false); - if (config.getBoolValue("showChatHistory")) - localChatTab->loadFromLogFile("#General"); // TRANSLATORS: chat tab header debugChatTab = new ChatTab(chatWindow, _("Debug"), "", @@ -588,13 +588,13 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot, if (serverName.empty()) { screenShortStr = strprintf("%s_Screenshot_%s_", - branding.getValue("appName", "ManaPlus").c_str(), + branding.getValue("appName", "ManaVerse").c_str(), buffer); } else { screenShortStr = strprintf("%s_Screenshot_%s_%s_", - branding.getValue("appName", "ManaPlus").c_str(), + branding.getValue("appName", "ManaVerse").c_str(), serverName.c_str(), buffer); } |