summaryrefslogtreecommitdiff
path: root/src/progs/dyecmd/client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/dyecmd/client.cpp')
-rw-r--r--src/progs/dyecmd/client.cpp31
1 files changed, 17 insertions, 14 deletions
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index ec88650c1..a1d69fd30 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.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
@@ -64,6 +65,7 @@
#include "utils/gettext.h"
#include "utils/gettexthelper.h"
#include "utils/mrand.h"
+#include "utils/performance.h"
#ifdef ANDROID
#include "fs/paths.h"
#endif // ANDROID
@@ -77,7 +79,7 @@
#include "net/ipc.h"
-#ifdef WIN32
+#ifdef _WIN32
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_syswm.h>
@@ -85,9 +87,9 @@ PRAGMA48(GCC diagnostic pop)
#include <sys/time.h>
#include "fs/specialfolder.h"
#undef ERROR
-#else // WIN32
+#else // _WIN32
#include <ctime>
-#endif // WIN32
+#endif // _WIN32
#ifdef ANDROID
#ifndef USE_SDL2
@@ -191,7 +193,7 @@ void Client::gameInit()
else
{
settings.logFileName = pathJoin(settings.localDataDir,
- "manaplus.log");
+ "manaverse.log");
}
logger->setLogFile(settings.logFileName);
@@ -259,9 +261,10 @@ void Client::gameInit()
eventsManager.init();
eventsManager.enableEvents();
-#ifdef WIN32
+#ifdef _WIN32
Dirs::mountDataDir();
-#endif // WIN32
+#endif // _WIN32
+
#ifndef USE_SDL2
WindowManager::setIcon();
#endif // USE_SDL2
@@ -285,10 +288,10 @@ void Client::gameInit()
SDL::allowScreenSaver(config.getBoolValue("allowscreensaver"));
initGraphics();
-#ifndef WIN32
+#ifndef _WIN32
Dirs::extractDataDir();
Dirs::mountDataDir();
-#endif // WIN32
+#endif // _WIN32
Dirs::updateDataPath();
@@ -506,7 +509,7 @@ void Client::gameClear()
logger->log1("Quitting11");
#ifdef USE_PROFILER
- Perfomance::clear();
+ Performance::clear();
#endif // USE_PROFILER
#ifdef DEBUG_OPENGL_LEAKS
@@ -774,7 +777,7 @@ void Client::moveButtons(const int width)
{
int x = width - mSetupButton->getWidth() - mButtonPadding;
mSetupButton->setPosition(x, mButtonPadding);
-#ifndef WIN32
+#ifndef _WIN32
x -= mPerfomanceButton->getWidth() + mButtonSpacing;
mPerfomanceButton->setPosition(x, mButtonPadding);
@@ -793,7 +796,7 @@ void Client::moveButtons(const int width)
x -= mCloseButton->getWidth() + mButtonSpacing;
mCloseButton->setPosition(x, mButtonPadding);
#endif // ANDROID
-#endif // WIN32
+#endif // _WIN32
}
}