REplace instances of TMW with Mana

10 files changed, 22 insertions, 22 deletions

diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 2bb9cff3..85d97e6b 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -41,8 +41,8 @@
 #include "main.h"
 #include "units.h"
 
-#ifdef TMWSERV_SUPPORT
-#include "net/tmwserv/accountserver/account.h"
+#ifdef MANASERV_SUPPORT
+#include "net/manaserv/accountserver/account.h"
 #else
 #include "net/ea/protocol.h"
 #endif
diff --git a/src/gui/guildwindow.cpp b/src/gui/guildwindow.cpp
index 05af7780..9cebc4e1 100644
--- a/src/gui/guildwindow.cpp
+++ b/src/gui/guildwindow.cpp
@@ -38,7 +38,7 @@
 #include "log.h"
 #include "localplayer.h"
 
-#include "net/tmwserv/chatserver/guild.h"
+#include "net/manaserv/chatserver/guild.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/gui/playerbox.cpp b/src/gui/playerbox.cpp
index 9a1f4805..aecca0c6 100644
--- a/src/gui/playerbox.cpp
+++ b/src/gui/playerbox.cpp
@@ -82,7 +82,7 @@ void PlayerBox::draw(gcn::Graphics *graphics)
     {
         // Draw character
         const int bs = getFrameSize();
-//#ifdef TMWSERV_SUPPORT
+//#ifdef MANASERV_SUPPORT
         const int x = getWidth() / 2 + bs;
         const int y = getHeight() - bs - 8;
         mPlayer->draw(static_cast<Graphics*>(graphics), x, y);
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index fb987363..54c0f334 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -128,7 +128,7 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                 /*mBrowserBox->addRow(strprintf("@@buddy|%s@@",
                                         strprintf(_("Add %s to Buddy List"),
                                                   name.c_str()).c_str()));*/
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
                 mBrowserBox->addRow(strprintf("@@guild|%s@@",
                                 strprintf(_("Invite %s to join your guild"),
                                                     name.c_str()).c_str()));
@@ -253,7 +253,7 @@ void PopupMenu::handleLink(const std::string &link)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
     }
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     // Guild action
     else if (link == "guild" &&
              being != NULL &&
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index e97eb099..9051a5f2 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -351,8 +351,8 @@ void ServerDialog::loadServers()
             if (xmlStrEqual(server->name, BAD_CAST "server"))
             {
                 //check wether the version matches
-                #ifdef TMWSERV_SUPPORT
-                if (XML::getProperty(server, "type", "unknown") != "TMWSERV")
+                #ifdef MANASERV_SUPPORT
+                if (XML::getProperty(server, "type", "unknown") != "MANASERV")
                     continue;
                 #endif
 
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index e89b7437..81b83fe6 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -81,7 +81,7 @@ class ChangeDisplay : public AttrDisplay, gcn::ActionListener
         int mNeeded;
 
         Label *mPoints;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         Button *mDec;
 #endif
         Button *mInc;
@@ -163,7 +163,7 @@ StatusWindow::StatusWindow():
 
     mCharacterPointsLabel = new Label("C");
     place(0, 6, mCharacterPointsLabel, 5);
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mCorrectionPointsLabel = new Label("C");
     place(0, 7, mCorrectionPointsLabel, 5);
 #endif
@@ -231,7 +231,7 @@ std::string StatusWindow::update(int id)
                                         player_node->getCharacterPoints()));
         mCharacterPointsLabel->adjustSize();
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         mCorrectionPointsLabel->setCaption(strprintf(_("Correction points: %d"),
                                         player_node->getCorrectionPoints()));
         mCorrectionPointsLabel->adjustSize();
@@ -486,7 +486,7 @@ ChangeDisplay::ChangeDisplay(int id, const std::string &name):
     place(6, 0, mInc);
     place(7, 0, mPoints);
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mDec = new Button(_("-"), "dec", this);
     mDec->setWidth(mInc->getWidth());
 
@@ -500,7 +500,7 @@ std::string ChangeDisplay::update()
 {
     mPoints->setCaption(toString(mNeeded));
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mDec->setEnabled(player_node->getCorrectionPoints());
 #endif
     mInc->setEnabled(player_node->getCharacterPoints() >= mNeeded);
@@ -517,7 +517,7 @@ void ChangeDisplay::setPointsNeeded(int needed)
 
 void ChangeDisplay::action(const gcn::ActionEvent &event)
 {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     if (event.getSource() == mDec)
     {
         int newcorpoints = player_node->getCorrectionPoints() - 1;
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index ce68eb4c..0706a17e 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -90,7 +90,7 @@ class StatusWindow : public Window
         ScrollArea *mDAttrScroll;
 
         gcn::Label *mCharacterPointsLabel;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         gcn::Label *mCorrectionPointsLabel;
 #endif
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index cf21288c..21a6ec80 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -55,7 +55,7 @@ Viewport::Viewport():
     mShowDebugPath(false),
     mVisibleNames(false),
     mPlayerFollowMouse(false),
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     mLocalWalkTime(-1)
 #else
     mWalkTime(0)
@@ -369,7 +369,7 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
         // Just walk around
         else
         {
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
             // FIXME: REALLY UGLY!
             Uint8 *keys = SDL_GetKeyState(NULL);
             if (!(keys[SDLK_LSHIFT] || keys[SDLK_RSHIFT]) &&
@@ -404,7 +404,7 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
     if (!mMap || !player_node)
         return;
 
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     if (mPlayerFollowMouse
         && get_elapsed_time(mLocalWalkTime) >= walkingMouseDelay)
     {
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 33a2d837..39dfaa33 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -172,7 +172,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
         bool mVisibleNames;          /**< Show target names. */
 
         bool mPlayerFollowMouse;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         int mLocalWalkTime; /**< Timestamp before the next walk can be sent. */
 #else
         int mWalkTime;
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index b73558c0..4e0313b6 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -43,7 +43,7 @@ extern Window *setupWindow;
 extern Window *skillDialog;
 extern Window *specialsWindow;
 extern Window *statusWindow;
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
 extern Window *buddyWindow;
 extern Window *guildWindow;
 #endif
@@ -60,7 +60,7 @@ WindowMenu::WindowMenu():
         N_("Inventory"),
         N_("Skills"),
         N_("Specials"),
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
         N_("Guilds"),
         N_("Buddies"),
 #endif
@@ -133,7 +133,7 @@ void WindowMenu::action(const gcn::ActionEvent &event)
     {
         window = specialsWindow;
     }
-#ifdef TMWSERV_SUPPORT
+#ifdef MANASERV_SUPPORT
     else if (event.getId() == "Guilds")
     {
         window = guildWindow;