diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-03-18 17:48:29 +0200 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-03-18 17:49:00 +0200 |
| commit | f98d003e354a1792117b7cbc771d1dd91475a156 (patch) | |
| tree | dc2a297f7c4026394c9954ae4bfd4abd22ef9612 /src/simpleanimation.cpp | |
| parent | bb0a6cb25b2985fd1f74c9d27d5a46f6863e2dee (diff) | |
| download | manaplus-f98d003e354a1792117b7cbc771d1dd91475a156.tar.gz manaplus-f98d003e354a1792117b7cbc771d1dd91475a156.tar.bz2 manaplus-f98d003e354a1792117b7cbc771d1dd91475a156.tar.xz manaplus-f98d003e354a1792117b7cbc771d1dd91475a156.zip | |
Fix most old style cast except manaserv and libxml2 defines.
Diffstat (limited to 'src/simpleanimation.cpp')
| -rw-r--r-- | src/simpleanimation.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/simpleanimation.cpp b/src/simpleanimation.cpp index 5d8f1dc33..9931f491c 100644 --- a/src/simpleanimation.cpp +++ b/src/simpleanimation.cpp @@ -83,7 +83,7 @@ void SimpleAnimation::setFrame(int frame) if (frame < 0) frame = 0; - if ((unsigned)frame >= mAnimation->getLength()) + if (static_cast<unsigned>(frame) >= mAnimation->getLength()) frame = mAnimation->getLength() - 1; mAnimationPhase = frame; mCurrentFrame = mAnimation->getFrame(mAnimationPhase); @@ -104,8 +104,11 @@ void SimpleAnimation::update(int timePassed) mAnimationTime -= mCurrentFrame->delay; mAnimationPhase++; - if ((unsigned)mAnimationPhase >= mAnimation->getLength()) + if (static_cast<unsigned>(mAnimationPhase) + >= mAnimation->getLength()) + { mAnimationPhase = 0; + } mCurrentFrame = mAnimation->getFrame(mAnimationPhase); } |