aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/animation.cpp
diff options
context:
space:
mode:
authorStrangerke2013-09-12 21:44:36 +0200
committerStrangerke2013-09-12 21:44:36 +0200
commitb936611e030f6748013b5360c8617d44643cb335 (patch)
treef4641b4d15d045b12edbf88a612bfb69c6858103 /engines/avalanche/animation.cpp
parent11c496c31b6eb410d5bd10d346606a92c82664b4 (diff)
downloadscummvm-rg350-b936611e030f6748013b5360c8617d44643cb335.tar.gz
scummvm-rg350-b936611e030f6748013b5360c8617d44643cb335.tar.bz2
scummvm-rg350-b936611e030f6748013b5360c8617d44643cb335.zip
AVALANCHE: Fix various warnings reported by GCC and/or wjp
Diffstat (limited to 'engines/avalanche/animation.cpp')
-rw-r--r--engines/avalanche/animation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 5bff12307b..615bf94d40 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -226,7 +226,7 @@ void AnimationType::walk() {
break;
case Gyro::kMagicUnfinished: {
bounce();
- Common::String tmpStr = Common::String::format("%cSorry.%cThis place is not available yet!", Scrolls::kControlBell, Scrolls::kControlCenter, Scrolls::kControlRoman);
+ Common::String tmpStr = Common::String::format("%c%cSorry.%cThis place is not available yet!", Scrolls::kControlBell, Scrolls::kControlCenter, Scrolls::kControlRoman);
_anim->_vm->_scrolls->displayText(tmpStr);
}
break;
@@ -352,8 +352,8 @@ void AnimationType::remove() {
if ((_info._xLength % 8) > 0)
_info._xWidth++;
for (byte i = 0; i < _stat._frameNum; i++) {
+ assert(_animCount > 0);
_animCount--;
- assert(_animCount >= 0);
delete[] _info._mani[_animCount];
delete[] _info._sil[_animCount];
}