diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-04-24 21:33:13 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-04-24 23:28:10 +0300 |
| commit | 64810ef5b4b3d375e7af0f4fc9ee69e235afa568 (patch) | |
| tree | 6810d0f27a0e38c99370c3c9e8d08443ffe8d76f /src/being | |
| parent | 9d2eb460fa3569342044b6f3e61d52d86ca8cbb6 (diff) | |
| download | mv-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.gz mv-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.bz2 mv-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.tar.xz mv-64810ef5b4b3d375e7af0f4fc9ee69e235afa568.zip | |
Fix code style.
Diffstat (limited to 'src/being')
| -rw-r--r-- | src/being/being.cpp | 14 | ||||
| -rw-r--r-- | src/being/localplayer.cpp | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/being/being.cpp b/src/being/being.cpp index fefdbf256..a493d9a1a 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -1337,6 +1337,7 @@ void Being::setAction(const BeingAction::Action &action, const int attackId) } currentAction = getSpawnAction(); break; + case BeingAction::PRESTAND: default: logger->log("Being::setAction unknown action: " + toString(static_cast<unsigned>(action))); @@ -1748,6 +1749,7 @@ void Being::petLogic() case BeingAction::MOVE: case BeingAction::HURT: case BeingAction::SPAWN: + case BeingAction::PRESTAND: default: directionType = mInfo->getDirectionType(); break; @@ -3110,6 +3112,17 @@ void Being::saveComment(const std::string &restrict name, case ActorType::Npc: dir = settings.npcsDir; break; + case ActorType::Monster: + case ActorType::FloorItem: + case ActorType::Portal: + case ActorType::LocalPet: + case ActorType::Avatar: + case ActorType::Unknown: +#ifdef EATHENA_SUPPORT + case ActorType::Pet: + case ActorType::Mercenary: + case ActorType::Homunculus: +#endif default: return; } @@ -3427,6 +3440,7 @@ void Being::fixPetSpawnPos(int &dstX, int &dstY) const case BeingAction::SPAWN: case BeingAction::HURT: case BeingAction::STAND: + case BeingAction::PRESTAND: default: offsetX1 = mInfo->getTargetOffsetX(); offsetY1 = mInfo->getTargetOffsetY(); diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index e20fa9e02..ba7f4d794 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -693,6 +693,7 @@ bool LocalPlayer::toggleSit() const switch (mAction) { case BeingAction::STAND: + case BeingAction::PRESTAND: case BeingAction::SPAWN: newAction = BeingAction::SIT; break; |