summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-01-25 14:55:30 -0700
committerJared Adams <jaxad0127@gmail.com>2010-01-25 14:55:30 -0700
commit79245e6be83e5b2a92177fc98f256791cdc1e09a (patch)
tree8b9baa246998f33c7acf9e1a03062846afa9b121 /src
parentc1ac8aa8dc81bfcc06d7928ca974ec1a941c7adf (diff)
downloadmana-79245e6be83e5b2a92177fc98f256791cdc1e09a.tar.gz
mana-79245e6be83e5b2a92177fc98f256791cdc1e09a.tar.bz2
mana-79245e6be83e5b2a92177fc98f256791cdc1e09a.tar.xz
mana-79245e6be83e5b2a92177fc98f256791cdc1e09a.zip
Fix a bug when converting strings to server types
Diffstat (limited to 'src')
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/net/ea/beinghandler.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 7318a534..e92c9bec 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -51,7 +51,7 @@ ServerInfo::Type stringToServerType(const std::string &type)
{
if (compareStrI(type, "eathena") == 0)
{
- return ServerInfo::MANASERV;
+ return ServerInfo::EATHENA;
}
else if (compareStrI(type, "manaserv") == 0)
{
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index b80410ff..412b0930 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -551,11 +551,11 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
// Set these after the gender, as the sprites may be gender-specific
player->setSprite(SPRITE_WEAPON, weapon, "", true);
player->setSprite(SPRITE_SHIELD, shield);
- player->setSprite(SPRITE_SHOE, shoes);
+ //player->setSprite(SPRITE_SHOE, shoes);
player->setSprite(SPRITE_BOTTOMCLOTHES, headBottom);
player->setSprite(SPRITE_TOPCLOTHES, headMid);
player->setSprite(SPRITE_HAT, headTop);
- player->setSprite(SPRITE_GLOVES, gloves);
+ //player->setSprite(SPRITE_GLOVES, gloves);
//player->setSprite(SPRITE_CAPE, cape);
//player->setSprite(SPRITE_MISC1, misc1);
//player->setSprite(SPRITE_MISC2, misc2);