diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-10-23 20:05:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-10-23 20:05:05 +0300 |
| commit | 70e9b4d7aaf0e93dc715a201b1cca12900c72b37 (patch) | |
| tree | 3bf4e7f35b9c59cdda4fe54686bebbca7e41ef03 /src/being | |
| parent | cf1a1df92c0b6993df420456fce2654263e3dbc8 (diff) | |
| download | manaplus-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.tar.gz manaplus-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.tar.bz2 manaplus-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.tar.xz manaplus-70e9b4d7aaf0e93dc715a201b1cca12900c72b37.zip | |
Fix code style.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/actorsprite.cpp | 2 | ||||
| -rw-r--r-- | src/being/being.cpp | 2 | ||||
| -rw-r--r-- | src/being/being.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index 9b76ac328..fa5301664 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -213,7 +213,7 @@ void ActorSprite::setStatusEffectBlock(const int offset, const std::string str = strprintf( "Error: unknown effect by block-index. " "Offset: %d, effect int: %d, i: %u", - offset, (int)newEffects, i); + offset, static_cast<int>(newEffects), i); logger->log(str); DebugMessageListener::distributeEvent(str); } diff --git a/src/being/being.cpp b/src/being/being.cpp index 49d3ae4c7..4913d1b10 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -197,6 +197,8 @@ Being::Being(const BeingId id, #ifdef EATHENA_SUPPORT mChat(nullptr), mHorseInfo(nullptr), + mDownHorseSprites(), + mUpHorseSprites(), #endif mX(0), mY(0), diff --git a/src/being/being.h b/src/being/being.h index 9b6f3f6f7..d533570ca 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -1090,9 +1090,9 @@ class Being notfinal : public ActorSprite, #ifdef EATHENA_SUPPORT ChatObject *mChat; HorseInfo *mHorseInfo; -#endif std::vector<AnimatedSprite*> mDownHorseSprites; std::vector<AnimatedSprite*> mUpHorseSprites; +#endif int mX; // position in tiles int mY; // position in tiles |