diff options
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | docs/example.manaplus | 2 | ||||
-rw-r--r-- | manaplus.desktop | 2 | ||||
-rw-r--r-- | packaging/debian/manaplus.menu | 7 | ||||
-rw-r--r-- | packaging/switch/CMakeLists.txt.switch | 6 | ||||
-rw-r--r-- | packaging/windows/setup.nsi | 2 | ||||
-rw-r--r-- | src/game.cpp | 4 | ||||
-rw-r--r-- | src/main.h | 8 | ||||
-rw-r--r-- | tools/doxygen/doxygen.conf | 2 |
10 files changed, 20 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c5dd2987d..aaca9b88d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ SET(CPACK_PACKAGE_VERSION_MAJOR ${VER_MAJOR}) SET(CPACK_PACKAGE_VERSION_MINOR ${VER_MINOR}) SET(CPACK_PACKAGE_VERSION_PATCH ${VER_RELEASE}) IF(WIN32) - SET(CPACK_NSIS_DISPLAY_NAME "ManaPlus") + SET(CPACK_NSIS_DISPLAY_NAME "ManaVerse") SET(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/manaplus.ico") SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/setup_welcome.bmp") SET(CPACK_NSIS_URL_INFO_ABOUT "https://manaverse.germantmw.de") diff --git a/configure.ac b/configure.ac index b6adac16b..1726f004d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([ManaPlus], [1.0], [], [manaplus], [https://manaverse.germantmw.de]) +AC_INIT([ManaVerse], [1.0], [], [manaplus], [https://manaverse.germantmw.de]) AM_INIT_AUTOMAKE([1.9]) AC_LANG([C++]) diff --git a/docs/example.manaplus b/docs/example.manaplus index 2a580463f..e39ab42d3 100644 --- a/docs/example.manaplus +++ b/docs/example.manaplus @@ -9,7 +9,7 @@ filename / path as a command line parameter --> <configuration> - <option name="appName" value="ManaPlus"/> + <option name="appName" value="ManaVerse"/> <option name="appShort" value="mana"/> <option name="appIcon" value="icons/manaplus"/> <option name="loginMusic" value="Magick - Real.ogg"/> diff --git a/manaplus.desktop b/manaplus.desktop index d225ab3b5..dd7d8069e 100644 --- a/manaplus.desktop +++ b/manaplus.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 -Name=ManaPlus +Name=ManaVerse Comment=A 2D MMORPG client Exec=manaplus StartupNotify=false diff --git a/packaging/debian/manaplus.menu b/packaging/debian/manaplus.menu index df633b0e9..1c23f6cf5 100644 --- a/packaging/debian/manaplus.menu +++ b/packaging/debian/manaplus.menu @@ -1,5 +1,6 @@ -?package(manaplus):needs="X11" section="Games/Adventure" \ - title="ManaPlus" \ - longtitle="ManaPlus is a 2D MMORPG client." \ +?package(manaplus): \ + needs="X11" section="Games/Adventure" \ + title="ManaVerse" \ + longtitle="ManaVerse is a 2D MMORPG client." \ command="/usr/games/manaplus" \ icon="/usr/share/pixmaps/manaplus.xpm" diff --git a/packaging/switch/CMakeLists.txt.switch b/packaging/switch/CMakeLists.txt.switch index c3d9ef8d4..bfb0b8832 100644 --- a/packaging/switch/CMakeLists.txt.switch +++ b/packaging/switch/CMakeLists.txt.switch @@ -39,9 +39,9 @@ endforeach (DIR) set(INCLUDES src src/sdl2gfx) -set(FLAGS -DPACKAGE_NAME=\"ManaPlus\" -DPACKAGE_TARNAME=\"manaplus\" -DPACKAGE_VERSION=\"1.9.3.23\" - -DPACKAGE_STRING=\"ManaPlus\ 1.9.3.23\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"https://manaverse.germantmw.de\" - -DPACKAGE=\"manaplus\" -DVERSION=\"1.9.3.23\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 +set(FLAGS -DPACKAGE_NAME=\"ManaVerse\" -DPACKAGE_TARNAME=\"manaplus\" -DPACKAGE_VERSION=\"1.0\" + -DPACKAGE_STRING=\"ManaVerse\ 1.0\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"https://manaverse.germantmw.de\" + -DPACKAGE=\"manaplus\" -DVERSION=\"1.0\" -DTIME_WITH_SYS_TIME=1 -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKET_H=1 -DSELECT_TYPE_ARG1=int -DSELECT_TYPE_ARG234=\(fd_set\ \\*\) -DSELECT_TYPE_ARG5=\(struct\ timeval\ \\*\) diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi index f5ca57644..28f782193 100644 --- a/packaging/windows/setup.nsi +++ b/packaging/windows/setup.nsi @@ -53,7 +53,7 @@ RequestExecutionLevel admin !include "MultiUser.nsh" ; HM NIS Edit helper defines -!define PRODUCT_NAME "ManaPlus" +!define PRODUCT_NAME "ManaVerse" !ifndef PRODUCT_VERSION !define PRODUCT_VERSION "1.1" !endif diff --git a/src/game.cpp b/src/game.cpp index 65f0fc2c0..ee22dc5c4 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -587,13 +587,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); } diff --git a/src/main.h b/src/main.h index 330c34069..4119c16f1 100644 --- a/src/main.h +++ b/src/main.h @@ -158,10 +158,12 @@ #define SIMD_NAME "" #endif // SIMD_SUPPORTED -#define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ -"; %s; " SDL_NAME ", " XML_NAME SIMD_NAME ", %s; 4144 v" SMALL_VERSION ")" +#define PACKAGE_EXTENDED_VERSION \ + PACKAGE_NAME " (" PACKAGE_OS "; %s; " \ + SDL_NAME ", " XML_NAME SIMD_NAME ", %s; v" SMALL_VERSION ")" -#define FULL_VERSION "ManaPlus " SMALL_VERSION " " PACKAGE_OS ", " \ +#define FULL_VERSION \ + PACKAGE_NAME " " SMALL_VERSION " " PACKAGE_OS ", " \ SDL_NAME ", " XML_NAME SIMD_NAME #ifdef ANDROID diff --git a/tools/doxygen/doxygen.conf b/tools/doxygen/doxygen.conf index 76ca1ea11..8b9578d2e 100644 --- a/tools/doxygen/doxygen.conf +++ b/tools/doxygen/doxygen.conf @@ -4,7 +4,7 @@ c# Doxyfile 1.8.8 # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = "ManaPlus" +PROJECT_NAME = "ManaVerse" PROJECT_NUMBER = PROJECT_BRIEF = PROJECT_LOGO = data/icons/manaplus.png |