diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 13:25:04 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-27 13:25:24 +0100 |
| commit | dd05447445dc1766e532130318af2cb6bb72a994 (patch) | |
| tree | c8b2cbac64ccf9545a39c143088b57fe2cb8e678 /src/net/ea | |
| parent | 05e753294c1a603252d2eed4b1731c3f50543a7e (diff) | |
| parent | 2aab736bc5d77ffda789d7de56cef100fac207e1 (diff) | |
| download | mana-client-dd05447445dc1766e532130318af2cb6bb72a994.tar.gz mana-client-dd05447445dc1766e532130318af2cb6bb72a994.tar.bz2 mana-client-dd05447445dc1766e532130318af2cb6bb72a994.tar.xz mana-client-dd05447445dc1766e532130318af2cb6bb72a994.zip | |
Merge branch 'aethyra/master'
Conflicts:
src/beingmanager.cpp
src/gui/confirm_dialog.cpp
src/gui/inventorywindow.cpp
src/gui/inventorywindow.h
src/gui/label.cpp
src/gui/label.h
src/gui/popup.cpp
src/gui/popup.h
src/gui/scrollarea.cpp
src/gui/skin.cpp
src/gui/skin.h
src/gui/speechbubble.cpp
src/gui/window.cpp
src/gui/window.h
src/localplayer.h
src/main.cpp
src/net/ea/playerhandler.cpp
src/resources/ambientoverlay.h
src/resources/dye.cpp
src/resources/imagewriter.cpp
src/resources/itemdb.cpp
src/shopitem.cpp
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index f78d6387..00230ea3 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -211,9 +211,8 @@ void PlayerHandler::handleMessage(MessageIn &msg) player_node->mX = x; player_node->mY = y; - logger->log("Adjust scrolling by %d:%d", - (int) scrollOffsetX, - (int) scrollOffsetY); + logger->log("Adjust scrolling by %d:%d", (int) scrollOffsetX, + (int) scrollOffsetY); viewport->scrollBy(scrollOffsetX, scrollOffsetY); } @@ -222,7 +221,7 @@ void PlayerHandler::handleMessage(MessageIn &msg) case SMSG_PLAYER_STAT_UPDATE_1: { int type = msg.readInt16(); - Uint32 value = msg.readInt32(); + int value = msg.readInt32(); switch (type) { @@ -242,7 +241,7 @@ void PlayerHandler::handleMessage(MessageIn &msg) skillDialog->update(); break; case 0x0018: - if ((int) value >= player_node->getMaxWeight() / 2 && + if (value >= player_node->getMaxWeight() / 2 && player_node->getTotalWeight() < player_node->getMaxWeight() / 2) { |