diff options
Diffstat (limited to 'src/utils')
101 files changed, 392 insertions, 394 deletions
diff --git a/src/utils/booleanoptions.h b/src/utils/booleanoptions.h index 45d7d57e5..4b2cd1f2d 100644 --- a/src/utils/booleanoptions.h +++ b/src/utils/booleanoptions.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/browserboxtools.cpp b/src/utils/browserboxtools.cpp index 05bf139c9..ec56bc869 100644 --- a/src/utils/browserboxtools.cpp +++ b/src/utils/browserboxtools.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/browserboxtools.h b/src/utils/browserboxtools.h index dcae05886..d87fcddc6 100644 --- a/src/utils/browserboxtools.h +++ b/src/utils/browserboxtools.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/buildhex.h b/src/utils/buildhex.h index f3cec4ebd..79fd0f63b 100644 --- a/src/utils/buildhex.h +++ b/src/utils/buildhex.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2016-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/utils/cast.h b/src/utils/cast.h index f8c2d9e15..8b5f233c2 100644 --- a/src/utils/cast.h +++ b/src/utils/cast.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/chatutils.cpp b/src/utils/chatutils.cpp index 7aa6038d1..af5e1c6e8 100644 --- a/src/utils/chatutils.cpp +++ b/src/utils/chatutils.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/utils/chatutils.h b/src/utils/chatutils.h index 0f391de12..3fa08d364 100644 --- a/src/utils/chatutils.h +++ b/src/utils/chatutils.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/checkutils.cpp b/src/utils/checkutils.cpp index 13a51bf4c..30bf0c15e 100644 --- a/src/utils/checkutils.cpp +++ b/src/utils/checkutils.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/utils/checkutils.h b/src/utils/checkutils.h index 0d20673b8..b52743963 100644 --- a/src/utils/checkutils.h +++ b/src/utils/checkutils.h @@ -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 @@ -38,8 +38,7 @@ LOGGER_H #define reportAlwaysReal(...) \ { \ logger->log("Assert:"); \ - logger->assertLog( \ - __VA_ARGS__); \ + logger->assertLog(__VA_ARGS__); \ reportLogStack(__FILE__, __LINE__, __func__); \ } @@ -152,8 +151,7 @@ LOGGER_H #define failAlways(...) \ { \ logger->log("Assert:"); \ - logger->assertLog( \ - __VA_ARGS__); \ + logger->assertLog(__VA_ARGS__); \ reportLogStack(__FILE__, __LINE__, __func__); \ throw new std::exception(); \ } @@ -178,8 +176,7 @@ void reportStack(); #define reportAlwaysReal(...) \ { \ logger->log("Error:"); \ - logger->log( \ - __VA_ARGS__); \ + logger->log(__VA_ARGS__); \ } #define returnFalseVReal(val) \ diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index bae67aae8..7bbc5176c 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -1,10 +1,10 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2001-2010 Wormux Team * 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 @@ -63,7 +63,7 @@ PRAGMA48(GCC diagnostic pop) #include <unistd.h> #elif defined __native_client__ #include "utils/naclmessages.h" -#elif defined WIN32 +#elif defined _WIN32 #include "utils/cast.h" PRAGMA48(GCC diagnostic push) PRAGMA48(GCC diagnostic ignored "-Wshadow") @@ -94,7 +94,7 @@ bool sendBuffer(const std::string &restrict text) #else // USE_SDL2 -#ifdef WIN32 +#ifdef _WIN32 bool retrieveBuffer(std::string& text, size_t& pos) { bool ret = false; @@ -508,7 +508,7 @@ bool sendBuffer(const std::string &restrict text) naclPostMessage("clipboard-copy", text); return true; } -#else // WIN32 +#else // _WIN32 bool retrieveBuffer(std::string &text A_UNUSED, size_t &pos A_UNUSED) { @@ -519,5 +519,5 @@ bool sendBuffer(const std::string &restrict text A_UNUSED) { return false; } -#endif // WIN32 +#endif // _WIN32 #endif // USE_SDL2 diff --git a/src/utils/copynpaste.h b/src/utils/copynpaste.h index 78b3e3e13..ff0ef75aa 100644 --- a/src/utils/copynpaste.h +++ b/src/utils/copynpaste.h @@ -1,10 +1,10 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2001-2010 Wormux Team * 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/utils/cpu.cpp b/src/utils/cpu.cpp index ee53022a3..ca620a54e 100644 --- a/src/utils/cpu.cpp +++ b/src/utils/cpu.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/utils/cpu.h b/src/utils/cpu.h index 6e9cc01e1..b1a3ad31a 100644 --- a/src/utils/cpu.h +++ b/src/utils/cpu.h @@ -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/utils/delete2.h b/src/utils/delete2.h index 24ef88dfa..0cf8ab0b3 100644 --- a/src/utils/delete2.h +++ b/src/utils/delete2.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2014-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/utils/dtor.h b/src/utils/dtor.h index b731e8bbd..2486cfbd9 100644 --- a/src/utils/dtor.h +++ b/src/utils/dtor.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/utils/dumplibs.cpp b/src/utils/dumplibs.cpp index 1bdcb139e..7efa3704a 100644 --- a/src/utils/dumplibs.cpp +++ b/src/utils/dumplibs.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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 @@ -140,7 +140,13 @@ void dumpLibs() LIBXML_TEST_VERSION #endif // LIBXML_TEST_VERSION #ifdef ENABLE_LIBXML - const char *const *xmlVersion = __xmlParserVersion(); + const char *const *xmlVersion +#if LIBXML_VERSION > 21200 + = &xmlParserVersion; +#else + = __xmlParserVersion(); +#endif + if (xmlVersion != nullptr) logger->log(" libxml2: %s", *xmlVersion); #endif // ENABLE_LIBXML diff --git a/src/utils/dumplibs.h b/src/utils/dumplibs.h index c4d860559..1620fa6e4 100644 --- a/src/utils/dumplibs.h +++ b/src/utils/dumplibs.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/dumpsizes.cpp b/src/utils/dumpsizes.cpp index 73b148845..ac76f8d8d 100644 --- a/src/utils/dumpsizes.cpp +++ b/src/utils/dumpsizes.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/dumpsizes.h b/src/utils/dumpsizes.h index 7370bbb34..6dbae27f4 100644 --- a/src/utils/dumpsizes.h +++ b/src/utils/dumpsizes.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/env.cpp b/src/utils/env.cpp index a47a72c30..5ecbda7b9 100644 --- a/src/utils/env.cpp +++ b/src/utils/env.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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 @@ -29,14 +29,14 @@ void updateEnv() { -#if defined(WIN32) || defined(__APPLE__) +#if defined(_WIN32) || defined(__APPLE__) if (config.getBoolValue("centerwindow")) setEnv("SDL_VIDEO_CENTERED", "1"); else setEnv("SDL_VIDEO_CENTERED", "0"); -#endif // defined(WIN32) || defined(__APPLE__) +#endif // defined(_WIN32) || defined(__APPLE__) -#ifndef WIN32 +#ifndef _WIN32 const int vsync = settings.options.test.empty() ? config.getIntValue("vsync") : 1; // __GL_SYNC_TO_VBLANK is nvidia variable. @@ -54,20 +54,20 @@ void updateEnv() default: break; } -#endif // WIN32 +#endif // _WIN32 } void setEnv(const char *const name, const char *const value) { if ((name == nullptr) || (value == nullptr)) return; -#ifdef WIN32 +#ifdef _WIN32 if (putenv(const_cast<char*>((std::string(name) + "=" + value).c_str()))) -#else // WIN32 +#else // _WIN32 if (setenv(name, value, 1) != 0) -#endif // WIN32 +#endif // _WIN32 { logger->log("setenv failed: %s=%s", name, value); } diff --git a/src/utils/env.h b/src/utils/env.h index ac24165dd..8b2db5766 100644 --- a/src/utils/env.h +++ b/src/utils/env.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/foreach.h b/src/utils/foreach.h index 0615983ea..f0090a009 100644 --- a/src/utils/foreach.h +++ b/src/utils/foreach.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/fuzzer.cpp b/src/utils/fuzzer.cpp index 3054c812d..382ac7de0 100644 --- a/src/utils/fuzzer.cpp +++ b/src/utils/fuzzer.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/utils/fuzzer.h b/src/utils/fuzzer.h index f0b999fbe..6eec27342 100644 --- a/src/utils/fuzzer.h +++ b/src/utils/fuzzer.h @@ -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/utils/gettext.h b/src/utils/gettext.h index eb8d424a0..af7fbd619 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2007-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/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp index 66ebcb469..fadc19530 100644 --- a/src/utils/gettexthelper.cpp +++ b/src/utils/gettexthelper.cpp @@ -1,8 +1,9 @@ /* - * The ManaPlus Client - * Copyright (C) 2011-2019 The ManaPlus Developers + * The ManaVerse Client + * 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 @@ -33,10 +34,10 @@ #include <libintl.h> #include <locale.h> -#ifdef WIN32 +#ifdef _WIN32 #include <string> extern "C" char const *_nl_locale_name_default(void); -#endif // WIN32 +#endif // _WIN32 #elif defined(ENABLE_CUSTOMNLS) #include "utils/translation/podict.h" #ifdef __native_client__ @@ -44,9 +45,9 @@ extern "C" char const *_nl_locale_name_default(void); #endif // __native_client__ #endif // ENABLE_NLS -#if defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) && !defined(WIN32) +#if defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) && !defined(_WIN32) #include "utils/env.h" -#endif // defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) && !defined(WIN32) +#endif // defined(ENABLE_NLS) || defined(ENABLE_CUSTOMNLS) && !defined(_WIN32) #include "debug.h" @@ -54,7 +55,7 @@ extern "C" char const *_nl_locale_name_default(void); static std::string setLangEnv() { std::string lang = config.getStringValue("lang"); -#if defined(ENABLE_NLS) && defined(WIN32) +#if defined(ENABLE_NLS) && defined(_WIN32) if (lang.empty()) lang = std::string(_nl_locale_name_default()); #elif defined(ENABLE_CUSTOMNLS) && defined(__native_client__) @@ -65,18 +66,18 @@ static std::string setLangEnv() naclPostMessage("get-uilanguage", ""); lang = naclWaitForMessage(handle); } -#endif // defined(ENABLE_NLS) && defined(WIN32) +#endif // defined(ENABLE_NLS) && defined(_WIN32) if (!lang.empty()) { -#ifdef WIN32 +#ifdef _WIN32 putenv(const_cast<char*>(("LANG=" + lang).c_str())); putenv(const_cast<char*>(("LANGUAGE=" + lang).c_str())); -#else // WIN32 +#else // _WIN32 setEnv("LANG", lang.c_str()); setEnv("LANGUAGE", lang.c_str()); -#endif // WIN32 +#endif // _WIN32 } return lang; @@ -87,11 +88,11 @@ void GettextHelper::initLang() { #ifdef ENABLE_NLS const std::string lang = setLangEnv(); -#ifdef WIN32 +#ifdef _WIN32 // mingw doesn't like LOCALEDIR to be defined for some reason if (lang != "C") bindTextDomain("translations/"); -#else // WIN32 +#else // _WIN32 #ifdef ANDROID #ifdef USE_SDL2 bindTextDomain((std::string(getenv("APPDIR")).append("/locale")).c_str()); @@ -114,7 +115,7 @@ void GettextHelper::initLang() #endif // __APPLE__ #endif // ENABLE_PORTABLE #endif // ANDROID -#endif // WIN32 +#endif // _WIN32 char *locale = setlocale(LC_MESSAGES, lang.c_str()); if (locale) diff --git a/src/utils/gettexthelper.h b/src/utils/gettexthelper.h index 08a04d1d0..447182ce1 100644 --- a/src/utils/gettexthelper.h +++ b/src/utils/gettexthelper.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/glxhelper.cpp b/src/utils/glxhelper.cpp index f2d494906..8f06c716f 100644 --- a/src/utils/glxhelper.cpp +++ b/src/utils/glxhelper.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2014-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/utils/glxhelper.h b/src/utils/glxhelper.h index 8f21b407e..e75ac84ca 100644 --- a/src/utils/glxhelper.h +++ b/src/utils/glxhelper.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2014-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/utils/gmfunctions.cpp b/src/utils/gmfunctions.cpp index ec2ce4cef..ecea487ac 100644 --- a/src/utils/gmfunctions.cpp +++ b/src/utils/gmfunctions.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2016-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/utils/gmfunctions.h b/src/utils/gmfunctions.h index 74272c99f..b79c9bf9d 100644 --- a/src/utils/gmfunctions.h +++ b/src/utils/gmfunctions.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2016-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/utils/intmap.h b/src/utils/intmap.h index 5ece703f3..5d52be984 100644 --- a/src/utils/intmap.h +++ b/src/utils/intmap.h @@ -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/utils/itemxmlutils.cpp b/src/utils/itemxmlutils.cpp index e25bb9d60..f1de197f3 100644 --- a/src/utils/itemxmlutils.cpp +++ b/src/utils/itemxmlutils.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2014-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/utils/itemxmlutils.h b/src/utils/itemxmlutils.h index 08ca5f4f3..e141ead67 100644 --- a/src/utils/itemxmlutils.h +++ b/src/utils/itemxmlutils.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2014-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/utils/langs.cpp b/src/utils/langs.cpp index fc91e8f04..29d9adf98 100644 --- a/src/utils/langs.cpp +++ b/src/utils/langs.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/langs.h b/src/utils/langs.h index 41d3b68d2..ea9ca2513 100644 --- a/src/utils/langs.h +++ b/src/utils/langs.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/likely.h b/src/utils/likely.h index 428f4ff48..95ea26025 100644 --- a/src/utils/likely.h +++ b/src/utils/likely.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/mathutils.h b/src/utils/mathutils.h index 074ffcaf5..2f070da30 100644 --- a/src/utils/mathutils.h +++ b/src/utils/mathutils.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 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/utils/mrand.cpp b/src/utils/mrand.cpp index 0aaa7dba0..f26a4c1d1 100644 --- a/src/utils/mrand.cpp +++ b/src/utils/mrand.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2016-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/utils/mrand.h b/src/utils/mrand.h index 251a9caff..3cfed32a0 100644 --- a/src/utils/mrand.h +++ b/src/utils/mrand.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2016-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/utils/mutex.h b/src/utils/mutex.h index 9d0160c67..9eb6ab935 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2008-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/utils/naclmessages.cpp b/src/utils/naclmessages.cpp index abdf76e29..867854e45 100644 --- a/src/utils/naclmessages.cpp +++ b/src/utils/naclmessages.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2015-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/utils/naclmessages.h b/src/utils/naclmessages.h index e3c7662e1..39b8ed034 100644 --- a/src/utils/naclmessages.h +++ b/src/utils/naclmessages.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2015-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/utils/parameters.cpp b/src/utils/parameters.cpp index ebcf2e972..a5b5aa360 100644 --- a/src/utils/parameters.cpp +++ b/src/utils/parameters.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2016-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/utils/parameters.h b/src/utils/parameters.h index 3956a49b9..6b026c625 100644 --- a/src/utils/parameters.h +++ b/src/utils/parameters.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2016-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/utils/perfomance.cpp b/src/utils/performance.cpp index f8b851af6..e18e848e4 100644 --- a/src/utils/perfomance.cpp +++ b/src/utils/performance.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 @@ -23,11 +23,12 @@ #ifdef USE_PROFILER -#include "utils/perfomance.h" +#include "utils/performance.h" #include "configuration.h" #include "game.h" +#include "utils/cast.h" #include "utils/timer.h" #include <algorithm> @@ -41,10 +42,10 @@ static const clockid_t clockType = CLOCK_MONOTONIC; -#define timeData ((static_cast<long long int>(time.tv_sec) * 1000000000LL \ - + static_cast<long long int>(time.tv_nsec)) / 1) +#define timeData \ + (CAST_U64(time.tv_sec) * 1000000000LL + CAST_U64(time.tv_nsec)) -namespace Perfomance +namespace Performance { std::ofstream file; std::string temp; @@ -69,24 +70,26 @@ namespace Perfomance { timespec time; clock_gettime(clockType, &time); - temp.append(toString(timeData - startTime)).append( - " __init__\n"); + temp.append(toString(CAST_U64(timeData - startTime))) + .append(" __init__\n"); } void blockStart(const std::string &name) { timespec time; clock_gettime(clockType, &time); - temp.append(toString(timeData - startTime)).append( - " start: ").append(name).append("\n"); + temp.append(toString(CAST_U64(timeData - startTime))) + .append(" start: ") + .append(name).append("\n"); } void blockEnd(const std::string &name) { timespec time; clock_gettime(clockType, &time); - temp.append(toString(timeData - startTime)).append( - " end: ").append(name).append("\n"); + temp.append(toString(CAST_U64(timeData - startTime))) + .append(" end: ") + .append(name).append("\n"); } void flush() @@ -96,6 +99,6 @@ namespace Perfomance temp.clear(); // file.flush(); } -} // namespace Perfomance +} // namespace Performance #endif // USE_PROFILER diff --git a/src/utils/perfomance.h b/src/utils/performance.h index 6ff8769ec..4c52b12fe 100644 --- a/src/utils/perfomance.h +++ b/src/utils/performance.h @@ -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 @@ -19,26 +19,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef UTILS_PERFOMANCE_H -#define UTILS_PERFOMANCE_H +#ifndef UTILS_PERFORMANCE_H +#define UTILS_PERFORMANCE_H #ifdef USE_PROFILER -#include "utils/vector.h" #include <string> -#include <sstream> -#include <list> -#include <set> #include "localconsts.h" -#define PROFILER_START() Perfomance::start(); -#define PROFILER_END() Perfomance::flush(); -#define BLOCK_START(name) Perfomance::blockStart(name); -#define BLOCK_END(name) Perfomance::blockEnd(name); -#define FUNC_BLOCK(name, id) Perfomance::Func PerfomanceFunc##id(name); +#define PROFILER_START() Performance::start(); +#define PROFILER_END() Performance::flush(); +#define BLOCK_START(name) Performance::blockStart(name); +#define BLOCK_END(name) Performance::blockEnd(name); +#define FUNC_BLOCK(name, id) Performance::Func PerformanceFunc##id(name); -namespace Perfomance +namespace Performance { void start(); @@ -70,7 +66,7 @@ namespace Perfomance std::string name; }; -} // namespace Perfomance +} // namespace Performance #else // USE_PROFILER @@ -81,4 +77,4 @@ namespace Perfomance #define FUNC_BLOCK(name, id) #endif // USE_PROFILER -#endif // UTILS_PERFOMANCE_H +#endif // UTILS_PERFORMANCE_H diff --git a/src/utils/perfstat.cpp b/src/utils/perfstat.cpp index bfa62fd68..fa21dc001 100644 --- a/src/utils/perfstat.cpp +++ b/src/utils/perfstat.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2018-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/utils/perfstat.h b/src/utils/perfstat.h index 6be6c47bd..6af680a25 100644 --- a/src/utils/perfstat.h +++ b/src/utils/perfstat.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2018-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/utils/pnglib.cpp b/src/utils/pnglib.cpp index 639fc81dd..64affce6d 100644 --- a/src/utils/pnglib.cpp +++ b/src/utils/pnglib.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 diff --git a/src/utils/pnglib.h b/src/utils/pnglib.h index b4c758ce2..ae50a645b 100644 --- a/src/utils/pnglib.h +++ b/src/utils/pnglib.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/utils/process.cpp b/src/utils/process.cpp index d0e15bbd4..10ee5581f 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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 @@ -36,13 +36,13 @@ PRAGMA48(GCC diagnostic pop) #include "debug.h" -#if defined(WIN32) || defined(__linux__) || \ +#if defined(_WIN32) || defined(__linux__) || \ defined(__linux) || defined(__APPLE__) const int timeOut = 10; -#endif // defined(WIN32) || defined(__linux__) || +#endif // defined(_WIN32) || defined(__linux__) || // defined(__linux) || defined(__APPLE__) -#ifdef WIN32 +#ifdef _WIN32 #include "utils/stringutils.h" @@ -245,16 +245,16 @@ bool execFile(const std::string &pathName A_UNUSED, return false; } -#endif // WIN32 +#endif // _WIN32 -#if defined WIN64 +#if defined _WIN64 bool openBrowser(std::string url) { return reinterpret_cast<int64_t>(ShellExecute(nullptr, "open", replaceAll(url, " ", "").c_str(), nullptr, nullptr, SW_SHOWNORMAL)) > 32; } -#elif defined WIN32 +#elif defined _WIN32 bool openBrowser(std::string url) { return reinterpret_cast<int32_t>(ShellExecute(nullptr, "open", @@ -312,9 +312,9 @@ bool openBrowser(std::string url A_UNUSED) return false; } -#endif // WIN32 +#endif // _WIN32 -#ifdef WIN32 +#ifdef _WIN32 void setPriority(const bool big) { HANDLE hCurrentProcess = GetCurrentProcess(); @@ -323,9 +323,9 @@ void setPriority(const bool big) else SetPriorityClass(hCurrentProcess, BELOW_NORMAL_PRIORITY_CLASS); } -#else // WIN32 +#else // _WIN32 void setPriority(const bool big A_UNUSED) { } -#endif // WIN32 +#endif // _WIN32 diff --git a/src/utils/process.h b/src/utils/process.h index 2bdf2e462..8f1e9c5dd 100644 --- a/src/utils/process.h +++ b/src/utils/process.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/sdl2helper.cpp b/src/utils/sdl2helper.cpp index e63b848af..7cd6f04ba 100644 --- a/src/utils/sdl2helper.cpp +++ b/src/utils/sdl2helper.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/utils/sdl2helper.h b/src/utils/sdl2helper.h index bcfccb747..9a9d11f7f 100644 --- a/src/utils/sdl2helper.h +++ b/src/utils/sdl2helper.h @@ -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/utils/sdl2logger.cpp b/src/utils/sdl2logger.cpp index 4f721d24b..63fc94bbf 100644 --- a/src/utils/sdl2logger.cpp +++ b/src/utils/sdl2logger.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/sdl2logger.h b/src/utils/sdl2logger.h index c8217b32a..a97189837 100644 --- a/src/utils/sdl2logger.h +++ b/src/utils/sdl2logger.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/sdl2musichelper.cpp b/src/utils/sdl2musichelper.cpp index d548a1c49..1e195e9d5 100644 --- a/src/utils/sdl2musichelper.cpp +++ b/src/utils/sdl2musichelper.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/utils/sdl2musichelper.h b/src/utils/sdl2musichelper.h index 010c6d68a..4c468ae42 100644 --- a/src/utils/sdl2musichelper.h +++ b/src/utils/sdl2musichelper.h @@ -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/utils/sdlcheckutils.cpp b/src/utils/sdlcheckutils.cpp index 2c3cecdcd..84270522b 100644 --- a/src/utils/sdlcheckutils.cpp +++ b/src/utils/sdlcheckutils.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/utils/sdlcheckutils.h b/src/utils/sdlcheckutils.h index 334f934e5..1c1841bed 100644 --- a/src/utils/sdlcheckutils.h +++ b/src/utils/sdlcheckutils.h @@ -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/utils/sdlhelper.cpp b/src/utils/sdlhelper.cpp index ab1981023..dab2257bb 100644 --- a/src/utils/sdlhelper.cpp +++ b/src/utils/sdlhelper.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/utils/sdlhelper.h b/src/utils/sdlhelper.h index 53fe2ce26..ae44a16c3 100644 --- a/src/utils/sdlhelper.h +++ b/src/utils/sdlhelper.h @@ -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/utils/sdlmemoryobject.h b/src/utils/sdlmemoryobject.h index fe62b0235..a5ec0311b 100644 --- a/src/utils/sdlmemoryobject.h +++ b/src/utils/sdlmemoryobject.h @@ -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/utils/sdlmusichelper.cpp b/src/utils/sdlmusichelper.cpp index 879f5aefc..0f4bc121f 100644 --- a/src/utils/sdlmusichelper.cpp +++ b/src/utils/sdlmusichelper.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/utils/sdlmusichelper.h b/src/utils/sdlmusichelper.h index 1c47f4a4d..114cc28b4 100644 --- a/src/utils/sdlmusichelper.h +++ b/src/utils/sdlmusichelper.h @@ -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/utils/sdlpixel.h b/src/utils/sdlpixel.h index 8a7b5b652..4371044fb 100644 --- a/src/utils/sdlpixel.h +++ b/src/utils/sdlpixel.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/sdlsharedhelper.cpp b/src/utils/sdlsharedhelper.cpp index 39a579429..b1d6e54d7 100644 --- a/src/utils/sdlsharedhelper.cpp +++ b/src/utils/sdlsharedhelper.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/utils/sdlsharedhelper.h b/src/utils/sdlsharedhelper.h index 48e2cfa0a..a3eb59184 100644 --- a/src/utils/sdlsharedhelper.h +++ b/src/utils/sdlsharedhelper.h @@ -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/utils/stdmove.h b/src/utils/stdmove.h index 9bfbed099..678633a36 100644 --- a/src/utils/stdmove.h +++ b/src/utils/stdmove.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/stringmap.h b/src/utils/stringmap.h index 26b518bda..c646fd578 100644 --- a/src/utils/stringmap.h +++ b/src/utils/stringmap.h @@ -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/utils/stringutils.cpp b/src/utils/stringutils.cpp index 8daaf3be2..446d9d234 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2007-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 @@ -38,9 +38,9 @@ #include <algorithm> #include <sstream> -#ifdef WIN32 +#ifdef _WIN32 #include <sys/time.h> -#endif // WIN32 +#endif // _WIN32 #include "debug.h" @@ -947,8 +947,14 @@ std::string timeToStr(const uint32_t time) char buf[101]; const time_t tempTime = time; tm *const timeInfo = localtime(&tempTime); - if (strftime(&buf[0], 100, "%Y-%m-%d_%H-%M-%S", timeInfo) != 0U) + PRAGMA8(GCC diagnostic push) + PRAGMA8(GCC diagnostic ignored "-Wformat-y2k") + // %c is locale-defined format. gcc8 complains: + // '%c' yields only last 2 digits of year in some locales. + // However, mails *currently, on ML* expire in way less than a year. + if (strftime(&buf[0], 100, "%c", timeInfo) != 0U) return std::string(buf); + PRAGMA8(GCC diagnostic pop) return "unknown"; } @@ -1021,7 +1027,7 @@ std::string escapeString(std::string str) void sanitizePath(std::string &path) { -#ifdef WIN32 +#ifdef _WIN32 const char sepStr = '\\'; const std::string sep2Str = "\\\\"; const std::string sepWrongStr = "/"; @@ -1037,7 +1043,7 @@ void sanitizePath(std::string &path) std::string pathJoin(std::string str1, const std::string &str2) { -#ifdef WIN32 +#ifdef _WIN32 const char sep = '\\'; std::string sepStr = "\\"; #else @@ -1076,7 +1082,7 @@ std::string pathJoin(std::string str1, const std::string &str2, const std::string &str3) { -#ifdef WIN32 +#ifdef _WIN32 const char sep = '\\'; std::string sepStr = "\\"; #else diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index b5eca16ab..c093ad28d 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -1,11 +1,11 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2007-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 @@ -100,15 +100,10 @@ const char *ipToString(const uint32_t address) A_WARN_UNUSED; /** * A safe version of sprintf that returns a std::string of the result. */ -std::string strprintf(const char *const format, ...) A_NONNULL(1) A_WARN_UNUSED -#ifdef __GNUC__ -#ifdef __OpenBSD__ - __attribute__((__format__(printf, 1, 2))) -#else // __OpenBSD__ - __attribute__((__format__(gnu_printf, 1, 2))) -#endif // __OpenBSD__ -#endif // __GNUC__ -; +std::string strprintf(const char *const format, ...) + A_NONNULL(1) + A_WARN_UNUSED + A_FORMAT_PRINTF(false, 1, 2); /** * Removes colors from a string diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h index bc1857ef3..54e26ab66 100644 --- a/src/utils/stringvector.h +++ b/src/utils/stringvector.h @@ -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/utils/timer.cpp b/src/utils/timer.cpp index cc213249a..2d4802e42 100644 --- a/src/utils/timer.cpp +++ b/src/utils/timer.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/timer.h b/src/utils/timer.h index d092b27cb..a18d0d066 100644 --- a/src/utils/timer.h +++ b/src/utils/timer.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/translation/podict.cpp b/src/utils/translation/podict.cpp index 1f000ffd2..ef4e462e6 100644 --- a/src/utils/translation/podict.cpp +++ b/src/utils/translation/podict.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/utils/translation/podict.h b/src/utils/translation/podict.h index 4799a575f..9579a5686 100644 --- a/src/utils/translation/podict.h +++ b/src/utils/translation/podict.h @@ -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/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index a7319e04d..05b5c8006 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.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/utils/translation/poparser.h b/src/utils/translation/poparser.h index a5b494dac..3361906b6 100644 --- a/src/utils/translation/poparser.h +++ b/src/utils/translation/poparser.h @@ -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/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index c5bad1a55..e6cc19769 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -1,8 +1,9 @@ /* - * The ManaPlus Client - * Copyright (C) 2012-2019 The ManaPlus Developers + * The ManaVerse Client + * Copyright (C) 2012-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 diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h index 5ff3c2ce6..acb7ec34c 100644 --- a/src/utils/translation/translationmanager.h +++ b/src/utils/translation/translationmanager.h @@ -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/utils/vector.h b/src/utils/vector.h index 052643c38..360e7c9be 100644 --- a/src/utils/vector.h +++ b/src/utils/vector.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/x11logger.cpp b/src/utils/x11logger.cpp index cad32ae0b..cd44e5e0d 100644 --- a/src/utils/x11logger.cpp +++ b/src/utils/x11logger.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/x11logger.h b/src/utils/x11logger.h index 9bf1dd547..b14956201 100644 --- a/src/utils/x11logger.h +++ b/src/utils/x11logger.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2017-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/utils/xml.h b/src/utils/xml.h index 476cd6539..16084bde5 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/xml.inc b/src/utils/xml.inc index 1099663ed..dfae7602f 100644 --- a/src/utils/xml.inc +++ b/src/utils/xml.inc @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp index cc49a6012..9bff3f877 100644 --- a/src/utils/xml/libxml.cpp +++ b/src/utils/xml/libxml.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 @@ -30,8 +30,8 @@ #include "utils/cast.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" +#include "utils/performance.h" #include "utils/stringutils.h" - #include "utils/translation/podict.h" #include <fstream> @@ -44,14 +44,7 @@ namespace } // namespace static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg A_UNUSED, ...) -#ifdef __GNUC__ -#ifdef __OpenBSD__ - __attribute__((__format__(printf, 2, 3))) -#else // __OpenBSD__ - __attribute__((__format__(gnu_printf, 2, 3))) -#endif // __OpenBSD__ -#endif // __GNUC__ -; + A_FORMAT_PRINTF(false, 2, 3); static void xmlErrorLogger(void *ctx A_UNUSED, const char *msg, ...) { diff --git a/src/utils/xml/libxml.h b/src/utils/xml/libxml.h index 093329479..6015c7383 100644 --- a/src/utils/xml/libxml.h +++ b/src/utils/xml/libxml.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/utils/xml/libxml.inc b/src/utils/xml/libxml.inc index 27a73e08b..fd5e502c6 100644 --- a/src/utils/xml/libxml.inc +++ b/src/utils/xml/libxml.inc @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp index e14feb694..ebad1548a 100644 --- a/src/utils/xml/pugixml.cpp +++ b/src/utils/xml/pugixml.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,8 +31,8 @@ #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/fuzzer.h" +#include "utils/performance.h" #include "utils/stringutils.h" - #include "utils/translation/podict.h" #include <fstream> diff --git a/src/utils/xml/pugixml.h b/src/utils/xml/pugixml.h index e461cdcbe..ae9639276 100644 --- a/src/utils/xml/pugixml.h +++ b/src/utils/xml/pugixml.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/utils/xml/pugixml.inc b/src/utils/xml/pugixml.inc index cb288fb74..ec525ec45 100644 --- a/src/utils/xml/pugixml.inc +++ b/src/utils/xml/pugixml.inc @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/xml/pugixmlwriter.cpp b/src/utils/xml/pugixmlwriter.cpp index a5895c9da..71cf927ff 100644 --- a/src/utils/xml/pugixmlwriter.cpp +++ b/src/utils/xml/pugixmlwriter.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/xml/pugixmlwriter.h b/src/utils/xml/pugixmlwriter.h index 1592e3006..e8c30ecdb 100644 --- a/src/utils/xml/pugixmlwriter.h +++ b/src/utils/xml/pugixmlwriter.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp index c38f6bbbd..6646f136c 100644 --- a/src/utils/xml/tinyxml2.cpp +++ b/src/utils/xml/tinyxml2.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 @@ -30,8 +30,8 @@ #include "utils/cast.h" #include "utils/checkutils.h" #include "utils/fuzzer.h" +#include "utils/performance.h" #include "utils/stringutils.h" - #include "utils/translation/podict.h" #include <fstream> diff --git a/src/utils/xml/tinyxml2.h b/src/utils/xml/tinyxml2.h index e21c9fce4..01bc94f7a 100644 --- a/src/utils/xml/tinyxml2.h +++ b/src/utils/xml/tinyxml2.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/utils/xml/tinyxml2.inc b/src/utils/xml/tinyxml2.inc index 8faf8f924..100a87c97 100644 --- a/src/utils/xml/tinyxml2.inc +++ b/src/utils/xml/tinyxml2.inc @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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/utils/xmlutils.cpp b/src/utils/xmlutils.cpp index d8727630f..ce2c8923e 100644 --- a/src/utils/xmlutils.cpp +++ b/src/utils/xmlutils.cpp @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2014-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/utils/xmlutils.h b/src/utils/xmlutils.h index 187c16659..921c6be92 100644 --- a/src/utils/xmlutils.h +++ b/src/utils/xmlutils.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * Copyright (C) 2014-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/utils/xmlwriter.h b/src/utils/xmlwriter.h index f5162708b..98425e428 100644 --- a/src/utils/xmlwriter.h +++ b/src/utils/xmlwriter.h @@ -1,9 +1,9 @@ /* - * The ManaPlus Client + * The ManaVerse Client * 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 |