diff options
| author | uruk | 2013-09-08 12:57:34 +0200 |
|---|---|---|
| committer | uruk | 2013-09-08 12:57:34 +0200 |
| commit | 3950c871f220be48da65e44c87362016af8af340 (patch) | |
| tree | 85ea6063564f828d5f0a5f41b2d60eeb0672e468 /engines/avalanche/avalanche.cpp | |
| parent | 48f2a79ed2adefbc9b3fe79ef1dc54e052871d83 (diff) | |
| parent | e6956a994b980e81cd83784b67b7feb0d2250a75 (diff) | |
| download | scummvm-rg350-3950c871f220be48da65e44c87362016af8af340.tar.gz scummvm-rg350-3950c871f220be48da65e44c87362016af8af340.tar.bz2 scummvm-rg350-3950c871f220be48da65e44c87362016af8af340.zip | |
AVALANCHE: Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche
Conflicts:
engines/avalanche/animation.cpp
Diffstat (limited to 'engines/avalanche/avalanche.cpp')
| -rw-r--r-- | engines/avalanche/avalanche.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index d59c18b23e..d2e9a8de9b 100644 --- a/engines/avalanche/avalanche.cpp +++ b/engines/avalanche/avalanche.cpp @@ -282,7 +282,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) { byte spriteNum = 0; if (sz.isSaving()) { - for (int16 i = 0; i < _animation->kSpriteNumbMax; i++) { + for (byte i = 0; i < _animation->kSpriteNumbMax; i++) { if (_animation->_sprites[i]._quick) spriteNum++; } @@ -290,7 +290,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) { sz.syncAsByte(spriteNum); if (sz.isLoading()) { - for (int16 i = 0; i < _animation->kSpriteNumbMax; i++) { // Deallocate sprites. + for (byte i = 0; i < _animation->kSpriteNumbMax; i++) { // Deallocate sprites. if (_animation->_sprites[i]._quick) _animation->_sprites[i].remove(); } |