summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp2
-rw-r--r--src/main.cpp4
-rw-r--r--src/net/ea/charserverhandler.cpp2
-rw-r--r--src/net/manaserv/generalhandler.cpp2
-rw-r--r--src/tmw.rc2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 9bbf83bd..856288bc 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -407,7 +407,7 @@ static bool saveScreenshot()
filenameSuffix.str("");
filename << PHYSFS_getUserDir();
#if (defined __USE_UNIX98 || defined __FreeBSD__)
- filenameSuffix << ".tmw/";
+ filenameSuffix << ".mana/";
#elif defined __APPLE__
filenameSuffix << "Desktop/";
#endif
diff --git a/src/main.cpp b/src/main.cpp
index 607c6205..8ecac127 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -288,7 +288,7 @@ static void setUpdatesDir()
}
/**
- * Initializes the home directory. On UNIX and FreeBSD, ~/.tmw is used. On
+ * Initializes the home directory. On UNIX and FreeBSD, ~/.mana is used. On
* Windows and other systems we use the current working directory.
*/
static void initHomeDir(const Options &options)
@@ -298,7 +298,7 @@ static void initHomeDir(const Options &options)
if (homeDir.empty())
{
#ifdef __APPLE__
- // Use Application Directory instead of .tmw
+ // Use Application Directory instead of .mana
homeDir = std::string(PHYSFS_getUserDir()) +
"/Library/Application Support/" +
branding.getValue("appName", "Mana");
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 13c3cf45..0f93efb8 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -296,7 +296,7 @@ void CharServerHandler::connect()
outMsg.writeInt32(token.session_ID1);
outMsg.writeInt32(token.session_ID2);
// [Fate] The next word is unused by the old char server, so we squeeze in
- // tmw client version information
+ // mana client version information
outMsg.writeInt16(CLIENT_PROTOCOL_VERSION);
outMsg.writeInt8((token.sex == GENDER_MALE) ? 1 : 0);
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 0b2eefe2..d8dcb51c 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -164,7 +164,7 @@ void GeneralHandler::guiWindowsLoaded()
{
inventoryWindow->setSplitAllowed(true);
partyWindow->clearPartyName();
- skillDialog->loadSkills("tmw-skills.xml");
+ skillDialog->loadSkills("skills.xml");
specialsWindow->loadSpecials("specials.xml");
player_node->setExpNeeded(100);
diff --git a/src/tmw.rc b/src/tmw.rc
index 4902e07a..62dd9ec3 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -2,7 +2,7 @@
#include "winver.h"
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/mana.ico"
1 VERSIONINFO
FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD