summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt18
-rw-r--r--src/Makefile.am70
-rw-r--r--src/commandline.cpp7
-rw-r--r--src/defaults.cpp4
-rw-r--r--src/dirs.cpp32
-rw-r--r--src/fs/files.cpp2
-rw-r--r--src/fs/paths.cpp4
-rw-r--r--src/game.cpp4
-rw-r--r--src/gui/windowmanager.cpp2
-rw-r--r--src/gui/windows/updaterwindow.cpp2
-rw-r--r--src/logger.cpp8
-rw-r--r--src/main.h6
-rw-r--r--src/manaplus.rc24
-rw-r--r--src/manaverse.rc24
-rw-r--r--src/resources/db/emotedb.cpp6
-rw-r--r--src/test/testlauncher.cpp4
-rw-r--r--src/unittests/utils/xmlutils.cc2
-rw-r--r--src/utils/gettexthelper.cpp8
-rw-r--r--src/utils/translation/translationmanager.cpp2
19 files changed, 115 insertions, 114 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9f5a22e0f..59d3416fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2215,18 +2215,18 @@ IF (WIN32)
${SRCS}
fs/specialfolder.cpp
fs/specialfolder.h
- manaplus.rc
+ manaverse.rc
)
SET(DYE_CMD_SRCS
${DYE_CMD_SRCS}
fs/specialfolder.cpp
fs/specialfolder.h
- manaplus.rc
+ manaverse.rc
)
ENDIF ()
-#SET (PROGRAMS manaplus dyecmd)
-SET (PROGRAMS manaplus)
+#SET (PROGRAMS manaverse dyecmd)
+SET (PROGRAMS manaverse)
IF (ENABLE_TMWA)
SET(SRCS ${SRCS} ${SRCS_TMWA})
@@ -2234,7 +2234,7 @@ ELSE()
SET(SRCS ${SRCS})
ENDIF(ENABLE_TMWA)
-ADD_EXECUTABLE(manaplus WIN32 ${SRCS} ${SRCS_EVOL})
+ADD_EXECUTABLE(manaverse WIN32 ${SRCS} ${SRCS_EVOL})
#ADD_EXECUTABLE(dyecmd WIN32 ${DYE_CMD_SRCS})
IF (USE_SDL2)
@@ -2255,7 +2255,7 @@ ELSE()
${SDLTTF_LIBRARY})
ENDIF (USE_SDL2)
-TARGET_LINK_LIBRARIES(manaplus
+TARGET_LINK_LIBRARIES(manaverse
${X11_LIBRARIES}
${SDL_LIBS}
${PNG_LIBRARIES}
@@ -2265,7 +2265,7 @@ TARGET_LINK_LIBRARIES(manaplus
${OPENGL_LIBRARIES}
${LIBINTL_LIBRARIES}
${EXTRA_LIBRARIES})
-INSTALL(TARGETS manaplus RUNTIME DESTINATION ${PKG_BINDIR})
+INSTALL(TARGETS manaverse RUNTIME DESTINATION ${PKG_BINDIR})
#TARGET_LINK_LIBRARIES(dyecmd
# ${SDLGFX_LIBRARIES}
@@ -2286,9 +2286,9 @@ INSTALL(TARGETS manaplus RUNTIME DESTINATION ${PKG_BINDIR})
IF (CMAKE_SYSTEM_NAME STREQUAL SunOS)
# we expect the SMCgtxt package to be present on Solaris;
# the Solaris gettext is not API-compatible to GNU gettext
- SET_TARGET_PROPERTIES(manaplus PROPERTIES LINK_FLAGS "-L/usr/local/lib")
+ SET_TARGET_PROPERTIES(manaverse PROPERTIES LINK_FLAGS "-L/usr/local/lib")
# SET_TARGET_PROPERTIES(dyecmd PROPERTIES LINK_FLAGS "-L/usr/local/lib")
ENDIF()
-SET_TARGET_PROPERTIES(manaplus PROPERTIES COMPILE_FLAGS "${FLAGS}")
+SET_TARGET_PROPERTIES(manaverse PROPERTIES COMPILE_FLAGS "${FLAGS}")
#SET_TARGET_PROPERTIES(dyecmd PROPERTIES COMPILE_FLAGS "${DYE_FLAGS}")
diff --git a/src/Makefile.am b/src/Makefile.am
index f11d310e4..afd68ff9d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,9 +9,9 @@ AUTOMAKE_OPTIONS = subdir-objects
if ENABLE_GAMECLIENT
if ENABLE_DYECMD
-bin_PROGRAMS = manaplus dyecmd
+bin_PROGRAMS = manaverse dyecmd
else
-bin_PROGRAMS = manaplus
+bin_PROGRAMS = manaverse
endif
else
if ENABLE_DYECMD
@@ -52,97 +52,97 @@ dyecmd_CXXFLAGS = -std=c++11 \
-DPKG_DATADIR=\""$(pkgdatadir)/"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-Wall
-manaplus_CXXFLAGS = -std=c++11 \
+manaverse_CXXFLAGS = -std=c++11 \
-DPKG_DATADIR=\""$(pkgdatadir)/"\" \
-DLOCALEDIR=\""$(localedir)"\" \
-Wall
if ENABLE_WERROR
-manaplus_CXXFLAGS += -Werror
+manaverse_CXXFLAGS += -Werror
dyecmd_CXXFLAGS += -Werror
endif
if ENABLE_GLIBCDEBUG
# _LIBCPP_DEBUG=1 probably giving false positives and it's hard to debug
# disabled for now
-manaplus_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=0
+manaverse_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=0
dyecmd_CXXFLAGS += -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_LIBCPP_DEBUG=0
endif
if ENABLE_COMMANDLINEPASSWORD
-manaplus_CXXFLAGS += -DENABLE_COMMANDLINEPASSWORD
+manaverse_CXXFLAGS += -DENABLE_COMMANDLINEPASSWORD
endif
if USE_X11
-manaplus_CXXFLAGS += -DUSE_X11
+manaverse_CXXFLAGS += -DUSE_X11
dyecmd_CXXFLAGS += -DUSE_X11
endif
if ENABLE_ASSERTS
-manaplus_CXXFLAGS += -DENABLE_ASSERTS
+manaverse_CXXFLAGS += -DENABLE_ASSERTS
dyecmd_CXXFLAGS += -DENABLE_ASSERTS
if HAVE_RDYNAMIC
-manaplus_LDFLAGS = -rdynamic
+manaverse_LDFLAGS = -rdynamic
dyecmd_LDFLAGS = -rdynamic
endif
endif
if HAVE_EXECINFO
-manaplus_CXXFLAGS += -DHAVE_EXECINFO
+manaverse_CXXFLAGS += -DHAVE_EXECINFO
dyecmd_CXXFLAGS += -DHAVE_EXECINFO
endif
if HAVE_GLEXT
-manaplus_CXXFLAGS += -DHAVE_GLEXT
+manaverse_CXXFLAGS += -DHAVE_GLEXT
dyecmd_CXXFLAGS += -DHAVE_GLEXT
endif
if ENABLE_PUGIXML
-manaplus_CXXFLAGS += -DENABLE_PUGIXML
+manaverse_CXXFLAGS += -DENABLE_PUGIXML
dyecmd_CXXFLAGS += -DENABLE_PUGIXML
endif
if ENABLE_LIBXML
-manaplus_CXXFLAGS += -DENABLE_LIBXML
+manaverse_CXXFLAGS += -DENABLE_LIBXML
dyecmd_CXXFLAGS += -DENABLE_LIBXML
endif
if ENABLE_TINYXML2
-manaplus_CXXFLAGS += -DENABLE_TINYXML2
+manaverse_CXXFLAGS += -DENABLE_TINYXML2
dyecmd_CXXFLAGS += -DENABLE_TINYXML2
if USE_TINYXML_OLD
-manaplus_CXXFLAGS += -DUSE_TINYXML_OLD
+manaverse_CXXFLAGS += -DUSE_TINYXML_OLD
dyecmd_CXXFLAGS += -DUSE_TINYXML_OLD
endif
endif
if ENABLE_PORTABLE
dyecmd_CXXFLAGS += -DENABLE_PORTABLE
-manaplus_CXXFLAGS += -DENABLE_PORTABLE
+manaverse_CXXFLAGS += -DENABLE_PORTABLE
endif
if ENABLE_CUSTOMNLS
dyecmd_CXXFLAGS += -DENABLE_CUSTOMNLS
-manaplus_CXXFLAGS += -DENABLE_CUSTOMNLS
+manaverse_CXXFLAGS += -DENABLE_CUSTOMNLS
endif
if ENABLE_CHECKPLUGIN
dyecmd_CXXFLAGS += -DENABLE_CHECKPLUGIN -fplugin=../build/checkplugin.so -fplugin-arg-checkplugin-command=detectnullpointers
-manaplus_CXXFLAGS += -DENABLE_CHECKPLUGIN -fplugin=../build/checkplugin.so -fplugin-arg-checkplugin-command=detectnullpointers
+manaverse_CXXFLAGS += -DENABLE_CHECKPLUGIN -fplugin=../build/checkplugin.so -fplugin-arg-checkplugin-command=detectnullpointers
endif
if USE_OPENGL
dyecmd_CXXFLAGS += -DUSE_OPENGL
-manaplus_CXXFLAGS += -DUSE_OPENGL
+manaverse_CXXFLAGS += -DUSE_OPENGL
endif
if ENABLE_OPENGLERRORS
dyecmd_CXXFLAGS += -DOPENGLERRORS
-manaplus_CXXFLAGS += -DOPENGLERRORS
+manaverse_CXXFLAGS += -DOPENGLERRORS
endif
if ENABLE_MEM_DEBUG
dyecmd_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS
-manaplus_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS
+manaverse_CXXFLAGS += -DENABLE_MEM_DEBUG -DDEBUG_DUMP_LEAKS
-manaplus_SOURCES = debug/nvwa/_nvwa.h \
+manaverse_SOURCES = debug/nvwa/_nvwa.h \
debug/nvwa/c++11.h \
debug/nvwa/debug_new.cpp \
debug/nvwa/debug_new.h \
@@ -155,15 +155,15 @@ dyecmd_SOURCES = debug/nvwa/_nvwa.h \
debug/nvwa/fast_mutex.h \
debug/nvwa/static_assert.h
else
-manaplus_SOURCES =
+manaverse_SOURCES =
dyecmd_SOURCES =
endif
if ENABLE_STLDEBUG
dyecmd_CXXFLAGS += -DENABLE_STLDEBUG
-manaplus_CXXFLAGS += -DENABLE_STLDEBUG
+manaverse_CXXFLAGS += -DENABLE_STLDEBUG
-manaplus_SOURCES += debug/mse/msemsevector.h \
+manaverse_SOURCES += debug/mse/msemsevector.h \
debug/mse/msemstdvector.h \
debug/mse/mseprimitives.h
dyecmd_SOURCES += debug/mse/msemsevector.h \
@@ -172,20 +172,20 @@ dyecmd_SOURCES += debug/mse/msemsevector.h \
endif
if MINGW
-manaplus_SOURCES += manaplus.rc
-dyecmd_SOURCES += manaplus.rc
+manaverse_SOURCES += manaverse.rc
+dyecmd_SOURCES += manaverse.rc
endif
dyecmd_CXXFLAGS += -DDYECMD
dyecmd_SOURCES += progs/dyecmd/dyemain.cpp
if USE_MUMBLE
-manaplus_CXXFLAGS += -DUSE_MUMBLE
+manaverse_CXXFLAGS += -DUSE_MUMBLE
endif
if ENABLE_CHECKS
dyecmd_CXXFLAGS += -DENABLE_CHECKS
-manaplus_CXXFLAGS += -DENABLE_CHECKS
+manaverse_CXXFLAGS += -DENABLE_CHECKS
endif
BASE_SRC =
@@ -193,14 +193,14 @@ BASE_SRC =
if USE_SDL2
if USE_INTERNALSDLGFX
dyecmd_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2
-manaplus_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2
+manaverse_CXXFLAGS += -I$(srcdir)/sdl2gfx -DUSE_SDL2
BASE_SRC += sdl2gfx/SDL2_framerate.cpp \
sdl2gfx/SDL2_framerate.h \
sdl2gfx/SDL2_rotozoom.cpp \
sdl2gfx/SDL2_rotozoom.h
else
dyecmd_CXXFLAGS += -DUSE_SDL2
-manaplus_CXXFLAGS += -DUSE_SDL2
+manaverse_CXXFLAGS += -DUSE_SDL2
endif
endif
@@ -1717,7 +1717,7 @@ SRC = ${BASE_SRC} \
progs/manaverse/gui/viewport.h
if ENABLE_TMWA
-manaplus_CXXFLAGS += -DTMWA_SUPPORT
+manaverse_CXXFLAGS += -DTMWA_SUPPORT
SRC += \
enums/magicschool.h \
gui/models/magicschoolmodel.h \
@@ -2129,10 +2129,10 @@ dyecmd_SOURCES += progs/dyecmd/gui/viewport.cpp \
progs/dyecmd/actions/windows.cpp
if ENABLE_GAMECLIENT
-manaplus_SOURCES += ${SRC}
+manaverse_SOURCES += ${SRC}
endif
-manaplustests_CXXFLAGS += ${manaplus_CXXFLAGS} \
+manaplustests_CXXFLAGS += ${manaverse_CXXFLAGS} \
-DUNITTESTS
manaplustests_LDFLAGS =
if ENABLE_PUGIXML
@@ -2255,7 +2255,7 @@ endif
EXTRA_DIST = CMakeLists.txt \
winver.h.in \
- manaplus.rc \
+ manaverse.rc \
SDLMain.m
# set the include path found by configure
diff --git a/src/commandline.cpp b/src/commandline.cpp
index 982078635..951f2c655 100644
--- a/src/commandline.cpp
+++ b/src/commandline.cpp
@@ -42,16 +42,17 @@ static void printHelp()
{
std::cout <<
// TRANSLATORS: command line help
- _("manaplus [options] [manaplus-file]") <<
+ _("manaverse [options] [manaverse-file]") <<
std::endl << std::endl <<
// TRANSLATORS: command line help
- _("[manaplus-file] : The manaplus file is an XML file (.manaplus)") <<
+ _("[mana-file] : The mana file is an XML file "
+ "(.mana)") <<
std::endl <<
// TRANSLATORS: command line help
_(" used to set custom parameters") <<
std::endl <<
// TRANSLATORS: command line help
- _(" to the manaplus client.") <<
+ _(" to the manaverse client.") <<
std::endl << std::endl <<
// TRANSLATORS: command line help
_("Options:") <<
diff --git a/src/defaults.cpp b/src/defaults.cpp
index eae83e1ab..4422f3158 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -492,7 +492,7 @@ void setBrandingDefaults(Configuration &cfg)
AddDEF("wallpapersPath", "");
AddDEF("wallpapersFile", "");
AddDEF("appName", "ManaVerse");
- AddDEF("appIcon", "icons/manaplus");
+ AddDEF("appIcon", "icons/manaverse");
AddDEF("loginMusic", "keprohm.ogg");
AddDEF("defaultServer", "");
AddDEF("defaultPort", DEFAULT_PORT);
@@ -503,7 +503,7 @@ void setBrandingDefaults(Configuration &cfg)
"https://tmw2.org/updates/serverlist.xml");
AddDEF("onlineServerFile", "serverlistplus.xml");
AddDEF("appShort", "mana");
- AddDEF("screenshots", "ManaPlus");
+ AddDEF("screenshots", "ManaVerse");
AddDEF("defaultUpdateHost", "");
AddDEF("helpPath", "");
AddDEF("tagsPath", "");
diff --git a/src/dirs.cpp b/src/dirs.cpp
index e564fe035..ebb86c13e 100644
--- a/src/dirs.cpp
+++ b/src/dirs.cpp
@@ -71,7 +71,7 @@ PRAGMA48(GCC diagnostic pop)
#include "debug.h"
#if defined __native_client__
-#define _nacl_dir std::string("/persistent/manaplus")
+#define _nacl_dir std::string("/persistent/manaverse")
#endif // defined __native_client__
#ifdef ANDROID
@@ -117,7 +117,7 @@ void extractAssets()
FILE *const file = fopen(fileName.c_str(), "w");
for (int f = 0; f < 100; f ++)
{
- std::string part = strprintf("manaplus-data.zip%u%u",
+ std::string part = strprintf("manaverse-data.zip%u%u",
CAST_U32(f / 10),
CAST_U32(f % 10));
logger->log("testing asset: " + part);
@@ -141,7 +141,7 @@ void extractAssets()
const std::string fileName2 = pathJoin(getenv("APPDIR"),
"locale.zip");
FILE *const file2 = fopen(fileName2.c_str(), "w");
- SDL_RWops *const rw = SDL_RWFromFile("manaplus-locale.zip", "r");
+ SDL_RWops *const rw = SDL_RWFromFile("manaverse-locale.zip", "r");
if (rw)
{
const int size = SDL_RWsize(rw);
@@ -250,7 +250,7 @@ void Dirs::mountDataDir()
{
std::string path = settings.options.brandingPath;
- // Strip blah.manaplus from the path
+ // Strip *.mana from the path
const int loc = CAST_S32(path.find_last_of('/'));
if (loc > 0)
@@ -344,19 +344,19 @@ void Dirs::initLocalDataDir()
// Use Application Directory instead of .mana
settings.localDataDir = pathJoin(VirtFs::getUserDir(),
"Library/Application Support",
- branding.getValue("appName", "ManaPlus"));
+ branding.getValue("appName", "ManaVerse"));
#elif defined __HAIKU__
settings.localDataDir = pathJoin(VirtFs::getUserDir(),
- "config/cache/Mana");
+ "config/cache/ManaVerse");
#elif defined WIN32
settings.localDataDir = getSpecialFolderLocation(CSIDL_LOCAL_APPDATA);
if (settings.localDataDir.empty())
settings.localDataDir = VirtFs::getUserDir();
settings.localDataDir = pathJoin(settings.localDataDir,
- "Mana");
+ "ManaVerse");
#elif defined __ANDROID__
settings.localDataDir = pathJoin(getSdStoragePath(),
- branding.getValue("appShort", "ManaPlus"),
+ branding.getValue("appShort", "ManaVerse"),
"local");
#elif defined __native_client__
settings.localDataDir = pathJoin(_nacl_dir, "local");
@@ -365,7 +365,7 @@ void Dirs::initLocalDataDir()
#else // __APPLE__
settings.localDataDir = pathJoin(VirtFs::getUserDir(),
- ".local/share/mana");
+ ".local/share/manaverse");
#endif // __APPLE__
}
@@ -401,11 +401,11 @@ void Dirs::initConfigDir()
{
#ifdef __APPLE__
settings.configDir = pathJoin(settings.localDataDir,
- branding.getValue("appShort", "mana"));
+ branding.getValue("appShort", "manaverse"));
#elif defined __HAIKU__
settings.configDir = pathJoin(VirtFs::getUserDir(),
- "config/settings/Mana",
- branding.getValue("appName", "ManaPlus"));
+ "config/settings/ManaVerse",
+ branding.getValue("appName", "ManaVerse"));
#elif defined WIN32
settings.configDir = getSpecialFolderLocation(CSIDL_APPDATA);
if (settings.configDir.empty())
@@ -416,11 +416,11 @@ void Dirs::initConfigDir()
{
settings.configDir = pathJoin(settings.configDir,
"mana",
- branding.getValue("appShort", "mana"));
+ branding.getValue("appShort", "manaverse"));
}
#elif defined __ANDROID__
settings.configDir = pathJoin(getSdStoragePath(),
- branding.getValue("appShort", "ManaPlus"),
+ branding.getValue("appShort", "ManaVerse"),
"config");
#elif defined __native_client__
settings.configDir = pathJoin(_nacl_dir, "config");
@@ -430,7 +430,7 @@ void Dirs::initConfigDir()
settings.configDir = pathJoin(VirtFs::getUserDir(),
".config/mana",
- branding.getValue("appShort", "mana"));
+ branding.getValue("appShort", "manaverse"));
#endif // __APPLE__
logger->log("Generating config dir: " + settings.configDir);
@@ -580,7 +580,7 @@ void Dirs::initScreenshotDir()
if (config.getBoolValue("useScreenshotDirectorySuffix"))
{
const std::string configScreenshotSuffix =
- branding.getValue("screenshots", "ManaPlus");
+ branding.getValue("screenshots", "ManaVerse");
if (!configScreenshotSuffix.empty())
{
diff --git a/src/fs/files.cpp b/src/fs/files.cpp
index 1dcbb9962..9cd3bfb0e 100644
--- a/src/fs/files.cpp
+++ b/src/fs/files.cpp
@@ -60,7 +60,7 @@ void Files::extractLocale()
const std::string dir = pathJoin("locale", *i);
if (VirtFs::isDirectory(dir))
{
- const std::string moFile = dir + "/LC_MESSAGES/manaplus.mo";
+ const std::string moFile = dir + "/LC_MESSAGES/manaverse.mo";
if (VirtFs::exists((moFile)))
{
const std::string localFile = pathJoin(localDir, moFile);
diff --git a/src/fs/paths.cpp b/src/fs/paths.cpp
index 76dba99f3..5388438c8 100644
--- a/src/fs/paths.cpp
+++ b/src/fs/paths.cpp
@@ -172,13 +172,13 @@ std::string removeLast(const std::string &str)
#ifdef WIN32
std::string getSelfName()
{
- return "manaplus.exe";
+ return "manaverse.exe";
}
#elif defined(__APPLE__)
std::string getSelfName()
{
- return "manaplus.exe";
+ return "manaverse.exe";
}
#elif defined __linux__ || defined __linux
diff --git a/src/game.cpp b/src/game.cpp
index 8b8706a03..30251db98 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/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index bbfd33db7..b72e9b783 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -418,7 +418,7 @@ void WindowManager::newChatMessage()
void WindowManager::setIcon()
{
#if !defined(ANDROID) && !defined(__SWITCH__)
- std::string iconFile = branding.getValue("appIcon", "icons/manaplus");
+ std::string iconFile = branding.getValue("appIcon", "icons/manaverse");
#ifdef WIN32
iconFile.append(".ico");
#else // WIN32
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 2ed01f4f3..d20c1aca0 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -1079,7 +1079,7 @@ void UpdaterWindow::loadMods(const std::string &dir,
if (file.group.empty())
continue;
std::string name = file.name;
- if (strStartWith(name, "manaplus_"))
+ if (strStartWith(name, "manaverse_"))
{
const std::set<std::string>::const_iterator
it = modsList.find(file.group);
diff --git a/src/logger.cpp b/src/logger.cpp
index ee95a85fe..f36d8cacd 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -51,14 +51,14 @@
#if defined(__ANDROID__)
#include <android/log.h>
#ifdef SPECIAL_LOGGING
-#define SPECIALLOG(x) __android_log_print(ANDROID_LOG_INFO, "manaplus", x);
+#define SPECIALLOG(x) __android_log_print(ANDROID_LOG_INFO, "manaverse", x);
#define DSPECIALLOG(x) __android_log_print(ANDROID_LOG_VERBOSE, \
- "manaplus", x);
+ "manaverse", x);
#else // SPECIAL_LOGGING
#define SPECIALLOG(x) if (mDebugLog) \
- __android_log_print(ANDROID_LOG_INFO, "manaplus", x);
+ __android_log_print(ANDROID_LOG_INFO, "manaverse", x);
#define DSPECIALLOG(x) if (mDebugLog) \
- __android_log_print(ANDROID_LOG_VERBOSE, "manaplus", x);
+ __android_log_print(ANDROID_LOG_VERBOSE, "manaverse", x);
#endif // SPECIAL_LOGGING
#elif defined __native_client__
#ifdef SPECIAL_LOGGING
diff --git a/src/main.h b/src/main.h
index 9b8d108a7..b08f1fcd7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -158,10 +158,10 @@
#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 "ManaVerse (" PACKAGE_OS \
+"; %s; " SDL_NAME ", " XML_NAME SIMD_NAME ", %s; jak1 v" SMALL_VERSION ")"
-#define FULL_VERSION "ManaPlus " SMALL_VERSION " " PACKAGE_OS ", " \
+#define FULL_VERSION "ManaVerse " SMALL_VERSION " " PACKAGE_OS ", " \
SDL_NAME ", " XML_NAME SIMD_NAME
#ifdef ANDROID
diff --git a/src/manaplus.rc b/src/manaplus.rc
deleted file mode 100644
index b9b0d9e57..000000000
--- a/src/manaplus.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <windows.h> // include for version info constants
-
-#include "winver.h"
-
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaplus.ico"
-tmw ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/tmw/icons/tmw-client.ico"
-
-1 VERSIONINFO
-FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
-//FILETYPE VFT_APP
-{
- BLOCK "StringFileInfo" {
- BLOCK "040904E4" {
- VALUE "CompanyName", "The ManaPlus Development Team"
- VALUE "FileVersion", PACKAGE_VERSION "4144"
- VALUE "FileDescription", "ManaPlus"
- VALUE "LegalCopyright", "2004-2014 (C)"
- VALUE "OriginalFilename", "manaplus.exe"
- VALUE "ProductName", "ManaPlus MMORPG Client"
- VALUE "ProductVersion", PACKAGE_VERSION "4144"
- }
- }
-}
diff --git a/src/manaverse.rc b/src/manaverse.rc
new file mode 100644
index 000000000..57de91dbb
--- /dev/null
+++ b/src/manaverse.rc
@@ -0,0 +1,24 @@
+#include <windows.h> // include for version info constants
+
+#include "winver.h"
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/icons/manaverse.ico"
+tmw ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../data/tmw/icons/tmw-client.ico"
+
+1 VERSIONINFO
+FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+//FILETYPE VFT_APP
+{
+ BLOCK "StringFileInfo" {
+ BLOCK "040904E4" {
+ VALUE "CompanyName", "The ManaVerse Development Team"
+ VALUE "FileVersion", PACKAGE_VERSION "jak1"
+ VALUE "FileDescription", "ManaVerse"
+ VALUE "LegalCopyright", "2020-2023 (C)"
+ VALUE "OriginalFilename", "manaverse.exe"
+ VALUE "ProductName", "ManaVerse MMORPG Client"
+ VALUE "ProductVersion", PACKAGE_VERSION "jak1"
+ }
+ }
+}
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 6785b9516..c997c1338 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -68,7 +68,7 @@ void EmoteDB::load()
// Only load client emotes if they're missing in server
if (mLastEmote < 20)
{
- loadSpecialXmlFile("graphics/sprites/manaplus_emotes.xml",
+ loadSpecialXmlFile("graphics/sprites/manaverse_emotes.xml",
SkipError_false);
}
@@ -158,7 +158,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName,
if ((rootNode == nullptr) || !xmlNameEqual(rootNode, "emotes"))
{
logger->log1("Emote Database: Error while loading"
- " manaplus_emotes.xml!");
+ " manaverse_emotes.xml!");
return;
}
@@ -181,7 +181,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName,
if (id == -1)
{
reportAlways("Emote Database: Emote with missing ID in "
- "manaplus_emotes.xml!")
+ "manaverse_emotes.xml!")
continue;
}
const int altId = XML::getProperty(emoteNode, "altid", -1);
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index a385abbea..39b9b6fda 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -416,9 +416,9 @@ int TestLauncher::testInternal()
Image *img[4];
img[0] = Theme::getImageFromTheme(
- "graphics/sprites/manaplus_emotions.png");
+ "graphics/sprites/manaverse_emotions.png");
img[1] = Theme::getImageFromTheme(
- "graphics/sprites/manaplus_emotions.png");
+ "graphics/sprites/manaverse_emotions.png");
img[2] = Theme::getImageFromTheme("graphics/sprites/arrow_left.png");
img[3] = Theme::getImageFromTheme("graphics/sprites/arrow_right.png");
int idx = 0;
diff --git a/src/unittests/utils/xmlutils.cc b/src/unittests/utils/xmlutils.cc
index 1028a99e0..64ca7e41f 100644
--- a/src/unittests/utils/xmlutils.cc
+++ b/src/unittests/utils/xmlutils.cc
@@ -141,7 +141,7 @@ TEST_CASE("xmlutils readXmlStringMap 1", "")
std::map<std::string, std::string> arr;
- readXmlStringMap("graphics/sprites/manaplus_emotes.xml",
+ readXmlStringMap("graphics/sprites/manaverse_emotes.xml",
"emotes",
"emote",
"sprite",
diff --git a/src/utils/gettexthelper.cpp b/src/utils/gettexthelper.cpp
index 33b366ad1..61a413866 100644
--- a/src/utils/gettexthelper.cpp
+++ b/src/utils/gettexthelper.cpp
@@ -108,7 +108,7 @@ void GettextHelper::initLang()
#else // ENABLE_PORTABLE
#ifdef __APPLE__
bindTextDomain((std::string(VirtFs::getBaseDir())
- .append("ManaPlus.app/Contents/Resources/locale/")).c_str());
+ .append("ManaVerse.app/Contents/Resources/locale/")).c_str());
#else // __APPLE__
bindTextDomain(LOCALEDIR);
@@ -130,8 +130,8 @@ void GettextHelper::initLang()
else
logger->log("locale empty");
}
- bind_textdomain_codeset("manaplus", "UTF-8");
- textdomain("manaplus");
+ bind_textdomain_codeset("manaverse", "UTF-8");
+ textdomain("manaverse");
#elif defined(ENABLE_CUSTOMNLS)
mainTranslator = new PoDict("en");
setLangEnv();
@@ -141,7 +141,7 @@ void GettextHelper::initLang()
#ifdef ENABLE_NLS
void GettextHelper::bindTextDomain(const char *const path)
{
- const char *const dir = bindtextdomain("manaplus", path);
+ const char *const dir = bindtextdomain("manaverse", path);
if (dir)
logger->log("bindtextdomain: %s", dir);
else
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index e75ef4857..49cadaf63 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -61,7 +61,7 @@ void TranslationManager::loadDictionaryLang()
void TranslationManager::loadGettextLang()
{
delete mainTranslator;
- mainTranslator = loadLang(getLang(), "manaplus/", nullptr);
+ mainTranslator = loadLang(getLang(), "manaverse/", nullptr);
}
#endif // ENABLE_CUSTOMNLS
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-25 19:57:26 +0000