From 332334a876da21687911c6d22cf4a5dcb2cb586a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 31 Dec 2013 15:00:31 +0300 Subject: add pet offset if owner is moving. New pet db attributes: moveOffsetX, moveOffsetY --- src/being/being.cpp | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'src/being') diff --git a/src/being/being.cpp b/src/being/being.cpp index 439cbd2c9..600de11e8 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -3246,15 +3246,27 @@ void Being::fixPetSpawnPos(int &dstX, int &dstY) const int offsetX1; int offsetY1; - if (mOwner->getCurrentAction() == SIT) + switch (mOwner->getCurrentAction()) { - offsetX1 = mInfo->getSitOffsetX(); - offsetY1 = mInfo->getSitOffsetY(); - } - else - { - offsetX1 = mInfo->getTargetOffsetX(); - offsetY1 = mInfo->getTargetOffsetY(); + case SIT: + offsetX1 = mInfo->getSitOffsetX(); + offsetY1 = mInfo->getSitOffsetY(); + break; + + case MOVE: + offsetX1 = mInfo->getMoveOffsetX(); + offsetY1 = mInfo->getMoveOffsetY(); + break; + + case ATTACK: + case DEAD: + case SPAWN: + case HURT: + case STAND: + default: + offsetX1 = mInfo->getTargetOffsetX(); + offsetY1 = mInfo->getTargetOffsetY(); + break; } int offsetX = offsetX1; -- cgit v1.2.3-70-g09d2