summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-04 08:53:01 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-06-04 08:53:01 +0000
commitef11f1b7f9c1ce48df0eff7acd3886768886449a (patch)
tree2b0aeada945f7072cf36bf3bd05b646c9bfdc8ac
parent631c3e27bda7d0a10a01e74a92d5269cc5881dba (diff)
downloadMana-ef11f1b7f9c1ce48df0eff7acd3886768886449a.tar.gz
Mana-ef11f1b7f9c1ce48df0eff7acd3886768886449a.tar.bz2
Mana-ef11f1b7f9c1ce48df0eff7acd3886768886449a.tar.xz
Mana-ef11f1b7f9c1ce48df0eff7acd3886768886449a.zip
Display shield sprite also in character select window (patch by Sanga).
-rw-r--r--ChangeLog5
-rw-r--r--src/net/charserverhandler.cpp2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b3f1119..11577f78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-04 Lloyd Bryant <lloyd_bryant@netzero.net>
+
+ * src/net/charserverhandler.cpp: Display shield sprite also in
+ character select window.
+
2008-05-30 Lloyd Bryant <lloyd_bryant@netzero.net>
* src/net/equipmenthandler.cpp, src/net/beinghandler.cpp,
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 5c275b94..5cc53f7d 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -208,7 +208,7 @@ LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
tempPlayer->mLevel = msg.readInt16();
msg.readInt16(); // skill point
tempPlayer->setSprite(Being::BOTTOMCLOTHES_SPRITE, msg.readInt16()); // head bottom
- msg.readInt16(); // shield
+ tempPlayer->setSprite(Being::SHIELD_SPRITE, msg.readInt16());
tempPlayer->setSprite(Being::HAT_SPRITE, msg.readInt16()); // head option top
tempPlayer->setSprite(Being::TOPCLOTHES_SPRITE, msg.readInt16()); // head option mid
int hairColor = msg.readInt16();