diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 2 | ||||
| -rw-r--r-- | src/gui/recorder.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 22 | ||||
| -rw-r--r-- | src/net/download.cpp | 4 | ||||
| -rw-r--r-- | src/tmw.rc | 8 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/game.cpp b/src/game.cpp index 5927924c..9bbf83bd 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -411,7 +411,7 @@ static bool saveScreenshot() #elif defined __APPLE__ filenameSuffix << "Desktop/"; #endif - filenameSuffix << "TMW_Screenshot_" << screenshotCount << ".png"; + filenameSuffix << "Mana_Screenshot_" << screenshotCount << ".png"; filename << filenameSuffix.str(); testExists.open(filename.str().c_str(), std::ios::in); found = !testExists.is_open(); diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp index b2679553..a86048c0 100644 --- a/src/gui/recorder.cpp +++ b/src/gui/recorder.cpp @@ -104,7 +104,7 @@ void Recorder::setRecordingFile(const std::string &msg) */ localChatTab->chatLog(_("Starting to record..."), BY_SERVER); const std::string file = - std::string(PHYSFS_getUserDir()) + "/.tmw/" + msgCopy; + std::string(PHYSFS_getUserDir()) + "/.mana/" + msgCopy; mStream.open(file.c_str(), std::ios_base::trunc); diff --git a/src/main.cpp b/src/main.cpp index 32c36adf..607c6205 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -301,10 +301,10 @@ static void initHomeDir(const Options &options) // Use Application Directory instead of .tmw homeDir = std::string(PHYSFS_getUserDir()) + "/Library/Application Support/" + - branding.getValue("appName", "The Mana World"); + branding.getValue("appName", "Mana"); #else homeDir = std::string(PHYSFS_getUserDir()) + - "/." + branding.getValue("appShort", "tmw"); + "/." + branding.getValue("appShort", "mana"); #endif } #if defined WIN32 @@ -433,7 +433,7 @@ static void initEngine(const Options &options) SetClassLong(pInfo.window, GCL_HICON, (LONG) icon); } #else - icon = IMG_Load(resman->getPath(branding.getValue("appIcon", "data/icons/tmw.png")).c_str()); + icon = IMG_Load(resman->getPath(branding.getValue("appIcon", "data/icons/mana.png")).c_str()); if (icon) { SDL_SetAlpha(icon, SDL_SRCALPHA, SDL_ALPHA_OPAQUE); @@ -539,7 +539,7 @@ static void printHelp() using std::endl; std::cout - << _("tmw") << endl << endl + << _("mana") << endl << endl << _("Options:") << endl << _(" -C --config-file : Configuration file to use") << endl << _(" -d --data : Directory to load game data from") << endl @@ -728,13 +728,13 @@ static void initInternationalization() #ifdef WIN32 putenv(("LANG=" + std::string(_nl_locale_name_default())).c_str()); // mingw doesn't like LOCALEDIR to be defined for some reason - bindtextdomain("tmw", "translations/"); + bindtextdomain("mana", "translations/"); #else - bindtextdomain("tmw", LOCALEDIR); + bindtextdomain("mana", LOCALEDIR); #endif setlocale(LC_MESSAGES, ""); - bind_textdomain_codeset("tmw", "UTF-8"); - textdomain("tmw"); + bind_textdomain_codeset("mana", "UTF-8"); + textdomain("mana"); #endif } @@ -785,10 +785,10 @@ int main(int argc, char *argv[]) // Configure logger logger = new Logger; - logger->setLogFile(homeDir + std::string("/tmw.log")); + logger->setLogFile(homeDir + std::string("/mana.log")); - // Log the tmw version - logger->log("The Mana World %s", FULL_VERSION); + // Log the mana version + logger->log("Mana %s", FULL_VERSION); initConfiguration(options); logger->setLogToStandardOut(config.getValue("logToStandardOut", 0)); diff --git a/src/net/download.cpp b/src/net/download.cpp index 8a5e0828..2d626270 100644 --- a/src/net/download.cpp +++ b/src/net/download.cpp @@ -199,9 +199,9 @@ int Download::downloadThread(void *ptr) } #ifdef PACKAGE_VERSION - curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT, "TMW/" PACKAGE_VERSION); + curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT, "Mana/" PACKAGE_VERSION); #else - curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT, "TMW"); + curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT, "Mana"); #endif curl_easy_setopt(d->mCurl, CURLOPT_ERRORBUFFER, d->mError); curl_easy_setopt(d->mCurl, CURLOPT_URL, d->mUrl.c_str()); @@ -10,12 +10,12 @@ PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD FILETYPE VFT_APP { BLOCK "StringFileInfo" { BLOCK "040904E4" { - VALUE "CompanyName", "The Mana World Development Team" + VALUE "CompanyName", "The Mana Development Team" VALUE "FileVersion", PACKAGE_VERSION - VALUE "FileDescription", "The Mana World" + VALUE "FileDescription", "Mana" VALUE "LegalCopyright", "2004-2009 (C)" - VALUE "OriginalFilename", "tmw.exe" - VALUE "ProductName", "The Mana World MMORPG" + VALUE "OriginalFilename", "mana.exe" + VALUE "ProductName", "Mana MMORPG Client" VALUE "ProductVersion", PACKAGE_VERSION } } |