From a48c9dc049e5c22a18f4ca16c0aedddc94812436 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Apr 2015 15:22:33 +0300
Subject: While updating stats Use INT_MAX as unset value for mod stat.
---
src/net/ea/playerhandler.cpp | 10 +++++-----
src/net/ea/playerhandler.h | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
(limited to 'src/net/ea')
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index f1bbc79c0..121a6284c 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -171,7 +171,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
return;
}
- playerHandler->setStat(msg, type, value, -1, true);
+ playerHandler->setStat(msg, type, value, NoStat, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate1")
}
@@ -180,7 +180,7 @@ void PlayerHandler::processPlayerStatUpdate2(Net::MessageIn &msg)
BLOCK_START("PlayerHandler::processPlayerStatUpdate2")
const int type = msg.readInt16("type");
const int value = msg.readInt32("value");
- playerHandler->setStat(msg, type, value, -1, true);
+ playerHandler->setStat(msg, type, value, NoStat, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate2")
}
@@ -211,7 +211,7 @@ void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::SKILL_RAISE_ERROR);
}
- playerHandler->setStat(msg, type, value, -1, true);
+ playerHandler->setStat(msg, type, value, NoStat, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate4")
}
@@ -221,7 +221,7 @@ void PlayerHandler::processPlayerStatUpdate6(Net::MessageIn &msg)
const int type = msg.readInt16("type");
const int value = msg.readUInt8("value");
if (statusWindow)
- playerHandler->setStat(msg, type, value, -1, true);
+ playerHandler->setStat(msg, type, value, NoStat, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate6")
}
@@ -251,7 +251,7 @@ bool PlayerHandler::canUseMagic() const
#define setStatComplex(stat) \
PlayerInfo::setStatBase(stat, base, notify); \
- if (mod != -1) \
+ if (mod != NoStat) \
PlayerInfo::setStatMod(stat, mod)
void PlayerHandler::setStat(Net::MessageIn &msg,
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index b0d20be6e..57a6265da 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -59,6 +59,8 @@ class PlayerHandler notfinal : public Net::PlayerHandler
const int mod,
const bool notify) const override;
+ static const int NoStat = INT_MAX;
+
protected:
static void processPlayerWarp(Net::MessageIn &msg);
--
cgit v1.2.3-70-g09d2