diff options
| author | Kamil Zbróg | 2013-12-02 12:45:34 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-12-02 12:45:34 +0000 |
| commit | f19f61a56da04e0dbd6e46ff9a303fdfb68d8390 (patch) | |
| tree | b10cbf38568e8cace510308ce0893541719ee775 /engines/tsage/core.cpp | |
| parent | 0f013bf6e1bed6a1e18aa1a4ea16ed1c0105f33d (diff) | |
| parent | ccc92b2e707643915efc575cd43fdd11169dc733 (diff) | |
| download | scummvm-rg350-f19f61a56da04e0dbd6e46ff9a303fdfb68d8390.tar.gz scummvm-rg350-f19f61a56da04e0dbd6e46ff9a303fdfb68d8390.tar.bz2 scummvm-rg350-f19f61a56da04e0dbd6e46ff9a303fdfb68d8390.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/tsage/core.cpp')
| -rw-r--r-- | engines/tsage/core.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp index 88f2c85ffd..596f056bfe 100644 --- a/engines/tsage/core.cpp +++ b/engines/tsage/core.cpp @@ -1547,7 +1547,7 @@ void ScenePalette::synchronize(Serializer &s) { if (s.getVersion() < 12) { int useless = 0; - s.syncAsSint16LE(useless); + s.syncAsSint32LE(useless); } s.syncAsByte(_redColor); @@ -2748,6 +2748,12 @@ GfxSurface SceneObject::getFrame() { } void SceneObject::reposition() { + if (g_vm->getGameID() == GType_Ringworld2) { + if (!(_flags & OBJFLAG_ZOOMED)) { + setZoom(g_globals->_sceneManager._scene->_zoomPercents[MIN(_position.y, (int16)255)]); + } + } + GfxSurface frame = getFrame(); _bounds.resize(frame, _position.x, _position.y - _yDiff, _percent); |