summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-30 23:12:26 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-30 23:12:26 +0300
commitafb92b74a224a56ea51a6e8053a0dc69ee0601ff (patch)
tree8361c17f9bf76b6bc711a3f1d9d014ef05c834f4
parentf493b31b59c79f8923d23634b7e2450c4df7019b (diff)
downloadplus-afb92b74a224a56ea51a6e8053a0dc69ee0601ff.tar.gz
plus-afb92b74a224a56ea51a6e8053a0dc69ee0601ff.tar.bz2
plus-afb92b74a224a56ea51a6e8053a0dc69ee0601ff.tar.xz
plus-afb92b74a224a56ea51a6e8053a0dc69ee0601ff.zip
Add manner field to beings.
-rw-r--r--src/being/being.h7
-rw-r--r--src/net/eathena/beinghandler.cpp12
-rw-r--r--src/net/eathena/charserverhandler.cpp2
-rw-r--r--src/net/tmwa/beinghandler.cpp10
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
5 files changed, 20 insertions, 13 deletions
diff --git a/src/being/being.h b/src/being/being.h
index 5f95fbfed..1ae269416 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -905,6 +905,12 @@ class Being notfinal : public ActorSprite,
int getKarma() const
{ return mKarma; }
+ void setManner(const int manner)
+ { mManner = manner; }
+
+ int getManner() const
+ { return mManner; }
+
protected:
/**
* Updates name's location.
@@ -1072,6 +1078,7 @@ class Being notfinal : public ActorSprite,
unsigned int mNumber;
int mUsageCounter;
int mKarma;
+ int mManner;
uint8_t mLook;
unsigned char mHairColor;
bool mErased;
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 1bd20c0e3..c92de3651 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -614,7 +614,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
}
msg.readInt16("emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
dstBeing->setKarma(msg.readUInt8("karma"));
dstBeing->setGender(Being::intToGender(msg.readUInt8("gender")));
@@ -739,7 +739,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
}
msg.readInt16("emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
dstBeing->setKarma(msg.readUInt8("karma"));
dstBeing->setGender(Being::intToGender(msg.readUInt8("gender")));
@@ -864,7 +864,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const
}
msg.readInt16("emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
dstBeing->setKarma(msg.readUInt8("karma"));
dstBeing->setGender(Being::intToGender(msg.readUInt8("gender")));
@@ -1031,7 +1031,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg)
msg.readInt16("robe");
msg.readInt32("guild id");
msg.readInt16("guild emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, static_cast<uint16_t>(
msg.readInt32("opt3")));
dstBeing->setKarma(msg.readUInt8("karma"));
@@ -1196,7 +1196,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg)
msg.readInt16("robe");
msg.readInt32("guild id");
msg.readInt16("guild emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, static_cast<uint16_t>(
msg.readInt32("opt3")));
dstBeing->setKarma(msg.readUInt8("karma"));
@@ -1363,7 +1363,7 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg)
msg.readInt16("robe");
msg.readInt32("guild id");
msg.readInt16("guild emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, static_cast<uint16_t>(
msg.readInt32("opt3")));
dstBeing->setKarma(msg.readUInt8("karma"));
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index b2ba2da08..0b48e8d80 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -162,7 +162,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
msg.readInt32("option");
tempPlayer->setKarma(msg.readInt32("karma"));
- msg.readInt32("manner");
+ tempPlayer->setManner(msg.readInt32("manner"));
msg.readInt16("left points");
data.mAttributes[Attributes::HP] = msg.readInt16("hp");
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 6d19dbe72..a996f97da 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -554,7 +554,7 @@ void BeingHandler::processPlayerUpdate1(Net::MessageIn &msg) const
}
msg.readInt16("emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
dstBeing->setKarma(msg.readUInt8("karma"));
// reserving bit for future usage
@@ -705,7 +705,7 @@ void BeingHandler::processPlayerUpdate2(Net::MessageIn &msg) const
}
msg.readInt16("emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
dstBeing->setKarma(msg.readUInt8("karma"));
// reserving bit for future usage
@@ -856,7 +856,7 @@ void BeingHandler::processPlayerMove(Net::MessageIn &msg) const
}
msg.readInt16("emblem");
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
dstBeing->setKarma(msg.readUInt8("karma"));
// reserving bit for future usage
@@ -1127,7 +1127,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg)
msg.readInt16("guild emblem");
}
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
if (serverFeatures->haveMonsterAttackRange()
&& dstBeing->getType() == ActorType::Monster)
@@ -1331,7 +1331,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg)
msg.readInt16("guild emblem");
}
- msg.readInt16("manner");
+ dstBeing->setManner(msg.readInt16("manner"));
dstBeing->setStatusEffectBlock(32, msg.readInt16("opt3"));
if (serverFeatures->haveMonsterAttackRange()
&& dstBeing->getType() == ActorType::Monster)
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 8c98c56e2..adf82cf34 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -160,7 +160,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
msg.readInt32("option");
tempPlayer->setKarma(msg.readInt32("karma"));
- msg.readInt32("manner");
+ tempPlayer->setManner(msg.readInt32("manner"));
msg.readInt16("character points left");
data.mAttributes[Attributes::HP] = msg.readInt16("hp");