summaryrefslogtreecommitdiff
path: root/src/progs/dyecmd
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/dyecmd')
-rw-r--r--src/progs/dyecmd/actions/actions.cpp6
-rw-r--r--src/progs/dyecmd/actions/chat.cpp6
-rw-r--r--src/progs/dyecmd/actions/commands.cpp6
-rw-r--r--src/progs/dyecmd/actions/move.cpp6
-rw-r--r--src/progs/dyecmd/actions/pets.cpp6
-rw-r--r--src/progs/dyecmd/actions/statusbar.cpp6
-rw-r--r--src/progs/dyecmd/actions/tabs.cpp6
-rw-r--r--src/progs/dyecmd/actions/target.cpp6
-rw-r--r--src/progs/dyecmd/actions/windows.cpp6
-rw-r--r--src/progs/dyecmd/client.cpp28
-rw-r--r--src/progs/dyecmd/client.h6
-rw-r--r--src/progs/dyecmd/dyemain.cpp6
-rw-r--r--src/progs/dyecmd/gui/viewport.cpp8
-rw-r--r--src/progs/dyecmd/gui/viewport.h6
14 files changed, 56 insertions, 52 deletions
diff --git a/src/progs/dyecmd/actions/actions.cpp b/src/progs/dyecmd/actions/actions.cpp
index 0b7827c62..d63037399 100644
--- a/src/progs/dyecmd/actions/actions.cpp
+++ b/src/progs/dyecmd/actions/actions.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/chat.cpp b/src/progs/dyecmd/actions/chat.cpp
index 3a07fae46..897972e46 100644
--- a/src/progs/dyecmd/actions/chat.cpp
+++ b/src/progs/dyecmd/actions/chat.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/commands.cpp b/src/progs/dyecmd/actions/commands.cpp
index 6de28b1ef..5ee075bb7 100644
--- a/src/progs/dyecmd/actions/commands.cpp
+++ b/src/progs/dyecmd/actions/commands.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/move.cpp b/src/progs/dyecmd/actions/move.cpp
index 081cfb25f..21c0608c8 100644
--- a/src/progs/dyecmd/actions/move.cpp
+++ b/src/progs/dyecmd/actions/move.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/pets.cpp b/src/progs/dyecmd/actions/pets.cpp
index d2f4ffaa6..5ab1dc1d6 100644
--- a/src/progs/dyecmd/actions/pets.cpp
+++ b/src/progs/dyecmd/actions/pets.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/statusbar.cpp b/src/progs/dyecmd/actions/statusbar.cpp
index e832c69f6..dfd1d082c 100644
--- a/src/progs/dyecmd/actions/statusbar.cpp
+++ b/src/progs/dyecmd/actions/statusbar.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/tabs.cpp b/src/progs/dyecmd/actions/tabs.cpp
index 32a50df4e..4747fd997 100644
--- a/src/progs/dyecmd/actions/tabs.cpp
+++ b/src/progs/dyecmd/actions/tabs.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/target.cpp b/src/progs/dyecmd/actions/target.cpp
index 31498c4fd..a0eefd9be 100644
--- a/src/progs/dyecmd/actions/target.cpp
+++ b/src/progs/dyecmd/actions/target.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/actions/windows.cpp b/src/progs/dyecmd/actions/windows.cpp
index eca631b23..8b40fd77f 100644
--- a/src/progs/dyecmd/actions/windows.cpp
+++ b/src/progs/dyecmd/actions/windows.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2012-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/client.cpp b/src/progs/dyecmd/client.cpp
index 9460d1465..a1d69fd30 100644
--- a/src/progs/dyecmd/client.cpp
+++ b/src/progs/dyecmd/client.cpp
@@ -1,11 +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-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
@@ -65,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
@@ -78,7 +79,7 @@
#include "net/ipc.h"
-#ifdef WIN32
+#ifdef _WIN32
PRAGMA48(GCC diagnostic push)
PRAGMA48(GCC diagnostic ignored "-Wshadow")
#include <SDL_syswm.h>
@@ -86,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
@@ -260,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
@@ -286,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();
@@ -507,7 +509,7 @@ void Client::gameClear()
logger->log1("Quitting11");
#ifdef USE_PROFILER
- Perfomance::clear();
+ Performance::clear();
#endif // USE_PROFILER
#ifdef DEBUG_OPENGL_LEAKS
@@ -775,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);
@@ -794,7 +796,7 @@ void Client::moveButtons(const int width)
x -= mCloseButton->getWidth() + mButtonSpacing;
mCloseButton->setPosition(x, mButtonPadding);
#endif // ANDROID
-#endif // WIN32
+#endif // _WIN32
}
}
diff --git a/src/progs/dyecmd/client.h b/src/progs/dyecmd/client.h
index fd5e9806c..016144470 100644
--- a/src/progs/dyecmd/client.h
+++ b/src/progs/dyecmd/client.h
@@ -1,11 +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-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/dyemain.cpp b/src/progs/dyecmd/dyemain.cpp
index 78d2e4cfa..8412396c9 100644
--- a/src/progs/dyecmd/dyemain.cpp
+++ b/src/progs/dyecmd/dyemain.cpp
@@ -1,9 +1,9 @@
/*
- * The ManaPlus Client
+ * The ManaVerse Client
* Copyright (C) 2013-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
diff --git a/src/progs/dyecmd/gui/viewport.cpp b/src/progs/dyecmd/gui/viewport.cpp
index 740e0d63b..574f0b19e 100644
--- a/src/progs/dyecmd/gui/viewport.cpp
+++ b/src/progs/dyecmd/gui/viewport.cpp
@@ -1,11 +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-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
@@ -31,6 +31,8 @@
#include "render/graphics.h"
+#include "utils/performance.h"
+
#include "debug.h"
Viewport *viewport = nullptr;
diff --git a/src/progs/dyecmd/gui/viewport.h b/src/progs/dyecmd/gui/viewport.h
index ae17dc7a4..021cb4c84 100644
--- a/src/progs/dyecmd/gui/viewport.h
+++ b/src/progs/dyecmd/gui/viewport.h
@@ -1,11 +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-2020 The ManaPlus Developers
- * Copyright (C) 2020-2023 The ManaVerse 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
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-16 01:17:20 +0000