diff options
| author | Strangerke | 2013-09-07 23:03:27 +0200 |
|---|---|---|
| committer | Strangerke | 2013-09-07 23:03:27 +0200 |
| commit | 5c00d5fe34ea5d8d0d27a9bb559c85a06d7693ed (patch) | |
| tree | a131d37571bc3c8766eb4a09dbc65011cab93ee5 /engines/avalanche/avalanche.cpp | |
| parent | 6383c7397d221bc77d79351d04afa8c7b7daa007 (diff) | |
| download | scummvm-rg350-5c00d5fe34ea5d8d0d27a9bb559c85a06d7693ed.tar.gz scummvm-rg350-5c00d5fe34ea5d8d0d27a9bb559c85a06d7693ed.tar.bz2 scummvm-rg350-5c00d5fe34ea5d8d0d27a9bb559c85a06d7693ed.zip | |
AVALANCHE: More renaming, use int16 for loops based on kSpriteNumbMax
Diffstat (limited to 'engines/avalanche/avalanche.cpp')
| -rw-r--r-- | engines/avalanche/avalanche.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp index f0f2bc1ea9..50b451a372 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 (byte i = 0; i < _animation->kSpriteNumbMax; i++) { + for (int16 i = 0; i < _animation->kSpriteNumbMax; i++) { if (_animation->tr[i].quick) spriteNum++; } @@ -290,33 +290,33 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) { sz.syncAsByte(spriteNum); if (sz.isLoading()) { - for (byte i = 0; i < _animation->kSpriteNumbMax; i++) { // Deallocate sprites. + for (int16 i = 0; i < _animation->kSpriteNumbMax; i++) { // Deallocate sprites. if (_animation->tr[i].quick) _animation->tr[i].done(); } } for (byte i = 0; i < spriteNum; i++) { - sz.syncAsByte(_animation->tr[i].whichsprite); + sz.syncAsByte(_animation->tr[i]._id); sz.syncAsByte(_animation->tr[i].check_me); if (sz.isLoading()) { _animation->tr[i].quick = true; - _animation->tr[i].init(_animation->tr[i].whichsprite, _animation->tr[i].check_me, _animation); + _animation->tr[i].init(_animation->tr[i]._id, _animation->tr[i].check_me, _animation); } - sz.syncAsByte(_animation->tr[i].ix); - sz.syncAsByte(_animation->tr[i].iy); - sz.syncAsByte(_animation->tr[i].face); + sz.syncAsByte(_animation->tr[i]._moveX); + sz.syncAsByte(_animation->tr[i]._moveY); + sz.syncAsByte(_animation->tr[i]._facingDir); sz.syncAsByte(_animation->tr[i].step); sz.syncAsByte(_animation->tr[i]._visible); sz.syncAsByte(_animation->tr[i]._homing); sz.syncAsByte(_animation->tr[i].count); sz.syncAsByte(_animation->tr[i]._info._xWidth); - sz.syncAsByte(_animation->tr[i].xs); - sz.syncAsByte(_animation->tr[i].ys); - sz.syncAsByte(_animation->tr[i].totalnum); + sz.syncAsByte(_animation->tr[i]._speedX); + sz.syncAsByte(_animation->tr[i]._speedY); + sz.syncAsByte(_animation->tr[i]._animCount); sz.syncAsSint16LE(_animation->tr[i]._homingX); sz.syncAsSint16LE(_animation->tr[i]._homingY); sz.syncAsByte(_animation->tr[i].call_eachstep); @@ -327,7 +327,7 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) { sz.syncAsSint16LE(_animation->tr[i]._y); if (sz.isLoading() && _animation->tr[i]._visible) - _animation->tr[i].appear(_animation->tr[i]._x, _animation->tr[i]._y, _animation->tr[i].face); + _animation->tr[i].appear(_animation->tr[i]._x, _animation->tr[i]._y, _animation->tr[i]._facingDir); } //groi = 177; |