diff options
| author | totycro <totycro@unknown-horizons.org> | 2011-04-09 15:11:35 +0200 |
|---|---|---|
| committer | totycro <totycro@unknown-horizons.org> | 2011-04-09 15:11:35 +0200 |
| commit | 13199a5212e210206b8d6b938f7c1683760cf226 (patch) | |
| tree | cba982d54d62081589d31f188796b65fc51b703d /pacman-c++/actor.cpp | |
| parent | 979c3b4528da1608404d6e163211280fee5da9c5 (diff) | |
| parent | 827a9b10539af4a8c4cff70fa345254668d294c7 (diff) | |
| download | foop-13199a5212e210206b8d6b938f7c1683760cf226.tar.gz foop-13199a5212e210206b8d6b938f7c1683760cf226.tar.bz2 foop-13199a5212e210206b8d6b938f7c1683760cf226.zip | |
Merge branch 'master' of git.manuel.mausz.at:/foop
Conflicts:
pacman-c++/sceneholder.cpp
pacman-c++/util.h
Diffstat (limited to 'pacman-c++/actor.cpp')
| -rw-r--r-- | pacman-c++/actor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pacman-c++/actor.cpp b/pacman-c++/actor.cpp index 445d63d..011fbeb 100644 --- a/pacman-c++/actor.cpp +++ b/pacman-c++/actor.cpp | |||
| @@ -81,7 +81,7 @@ QSequentialAnimationGroup *Actor::setupEatingAnimation(Actor::Movement direction | |||
| 81 | fadeout->setEndValue(false); | 81 | fadeout->setEndValue(false); |
| 82 | 82 | ||
| 83 | QPropertyAnimation *move = new QPropertyAnimation(img, "pos", m_moving); | 83 | QPropertyAnimation *move = new QPropertyAnimation(img, "pos", m_moving); |
| 84 | move->setDuration(Constants::tick); | 84 | move->setDuration(Constants::tick - 50); |
| 85 | move->setEndValue(QPoint(0, 0)); | 85 | move->setEndValue(QPoint(0, 0)); |
| 86 | } | 86 | } |
| 87 | 87 | ||
| @@ -106,8 +106,8 @@ bool Actor::isLocal() | |||
| 106 | void Actor::move(Actor::Movement direction) | 106 | void Actor::move(Actor::Movement direction) |
| 107 | { | 107 | { |
| 108 | //TODO: remove? | 108 | //TODO: remove? |
| 109 | if (isMoving()) | 109 | //if (isMoving()) |
| 110 | return; | 110 | // return; |
| 111 | 111 | ||
| 112 | /* stop current animation */ | 112 | /* stop current animation */ |
| 113 | if (direction != m_direction) | 113 | if (direction != m_direction) |