summaryrefslogtreecommitdiff
path: root/src/being
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-07-13 12:20:19 +0300
committerAndrei Karas <akaras@inbox.ru>2014-07-13 12:20:19 +0300
commitf0b7627b7d88c1d5bb484961377114b210c8dd53 (patch)
treea978c3b8eca88759fa71b5fc34112f4bea9bbcec /src/being
parentd9be27bba8941260500066cdd43ebb016356bc67 (diff)
downloadplus-f0b7627b7d88c1d5bb484961377114b210c8dd53.tar.gz
plus-f0b7627b7d88c1d5bb484961377114b210c8dd53.tar.bz2
plus-f0b7627b7d88c1d5bb484961377114b210c8dd53.tar.xz
plus-f0b7627b7d88c1d5bb484961377114b210c8dd53.zip
Fix code style.
Diffstat (limited to 'src/being')
-rw-r--r--src/being/being.cpp5
-rw-r--r--src/being/being.h2
-rw-r--r--src/being/localplayer.cpp2
-rw-r--r--src/being/localplayer.h3
4 files changed, 7 insertions, 5 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 95d0f9481..35e90590c 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -2130,8 +2130,9 @@ void Being::dumpSprites() const
const std::vector<int>::const_iterator it1_end = mSpriteIDs.end();
StringVectCIter it2 = mSpriteColors.begin();
const StringVectCIter it2_end = mSpriteColors.end();
- std::vector<int>::const_iterator it3 = mSpriteColorsIds.begin();
- const std::vector<int>::const_iterator it3_end = mSpriteColorsIds.end();
+ std::vector<unsigned char>::const_iterator it3 = mSpriteColorsIds.begin();
+ const std::vector<unsigned char>::const_iterator
+ it3_end = mSpriteColorsIds.end();
logger->log("sprites");
for (; it1 != it1_end && it2 != it2_end && it3 != it3_end;
diff --git a/src/being/being.h b/src/being/being.h
index c4b1b693c..ccfabe9a1 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -941,7 +941,7 @@ class Being notfinal : public ActorSprite,
StringVect mSpriteColors;
std::vector<int> mSpriteIDs;
- std::vector<int> mSpriteColorsIds;
+ std::vector<unsigned char> mSpriteColorsIds;
SpriteParticleInfo mSpriteParticles;
// Character guild information
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index c069a6e4e..aed7ff767 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -107,7 +107,7 @@ extern int weightNoticeTime;
extern MiniStatusWindow *miniStatusWindow;
extern SkillDialog *skillDialog;
-LocalPlayer::LocalPlayer(const int id, const int subtype) :
+LocalPlayer::LocalPlayer(const int id, const uint16_t subtype) :
Being(id, ActorType::PLAYER, subtype, nullptr),
AttributeListener(),
StatListener(),
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 8e72bf5d6..2b61c0d2e 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -53,7 +53,8 @@ class LocalPlayer final : public Being,
/**
* Constructor.
*/
- explicit LocalPlayer(const int id = 65535, const int subtype = 0);
+ explicit LocalPlayer(const int id = 65535,
+ const uint16_t subtype = 0U);
A_DELETE_COPY(LocalPlayer)