diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-10-03 18:56:04 +0200 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-10-03 18:56:04 +0200 |
| commit | 57dc8b63fbd9dbb62d4f113c5943c39a5c2c2c4b (patch) | |
| tree | c607fd42b2fd2ed29228195e3fb7437777431948 /src | |
| parent | f3eb30fff7d99e063185c40f1445de921e228424 (diff) | |
| parent | 8607ce53d1cb84c54ed1e7bdd17ad03c188ecd0c (diff) | |
| download | mana-client-57dc8b63fbd9dbb62d4f113c5943c39a5c2c2c4b.tar.gz mana-client-57dc8b63fbd9dbb62d4f113c5943c39a5c2c2c4b.tar.bz2 mana-client-57dc8b63fbd9dbb62d4f113c5943c39a5c2c2c4b.tar.xz mana-client-57dc8b63fbd9dbb62d4f113c5943c39a5c2c2c4b.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/charselectdialog.cpp | 1 | ||||
| -rw-r--r-- | src/net/ea/playerhandler.cpp | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index da2e0d9b..ec9c4818 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -260,7 +260,6 @@ bool CharSelectDialog::selectByName(const std::string &name) void CharSelectDialog::setNetworkOptions(bool allowUnregister, bool allowChangeEmail) { - printf("Network options: %d, %d\n", allowUnregister, allowChangeEmail); doAllowUnregister = allowUnregister; doAllowChangeEmail = allowChangeEmail; } diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index ae94ab92..95ecc47e 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -348,11 +348,14 @@ void PlayerHandler::handleMessage(MessageIn &msg) case SMSG_PLAYER_STAT_UPDATE_4: // Attribute increase ack { int type = msg.readInt16(); - int fail = msg.readInt8(); + int ok = msg.readInt8(); int value = msg.readInt8(); - if (fail != 1) - break; + if (ok != 1) + { + localChatTab->chatLog(_("Cannot raise skill!."), + BY_SERVER); + } int bonus = ATTR_BONUS(type); |