aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMarisa-Chan2014-11-07 10:23:29 +0600
committerMarisa-Chan2014-11-07 10:23:29 +0600
commit7151240345cc723c0084a4ea5dda9aaaa4dff690 (patch)
tree4146b67bb9cfe6f2dbc88600272e392569e016c8 /engines
parent3131e3aa5a3a4911c12223af06ad0d2885f64606 (diff)
downloadscummvm-rg350-7151240345cc723c0084a4ea5dda9aaaa4dff690.tar.gz
scummvm-rg350-7151240345cc723c0084a4ea5dda9aaaa4dff690.tar.bz2
scummvm-rg350-7151240345cc723c0084a4ea5dda9aaaa4dff690.zip
ZVISION: Now setBackgroundPosition must care about statekey value
Diffstat (limited to 'engines')
-rw-r--r--engines/zvision/graphics/render_manager.cpp3
-rw-r--r--engines/zvision/zvision.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index ce1962a8ee..4d5bcf754b 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -24,6 +24,7 @@
#include "zvision/zvision.h"
#include "zvision/graphics/render_manager.h"
+#include "zvision/scripting/script_manager.h"
#include "zvision/text/text.h"
#include "zvision/utility/lzss_read_stream.h"
@@ -384,6 +385,8 @@ void RenderManager::setBackgroundPosition(int offset) {
if (_bkgOff != offset)
_bkgDirtyRect = Common::Rect(_bkgWidth, _bkgHeight);
_bkgOff = offset;
+
+ _engine->getScriptManager()->setStateValue(StateKey_ViewPos, offset);
}
uint32 RenderManager::getCurrentBackgroundOffset() {
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 77c47d9b1e..41d3eea6aa 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -383,7 +383,6 @@ void ZVision::updateRotation() {
if (new_pos < 0)
new_pos += scr_width;
- _scriptManager->setStateValue(StateKey_ViewPos, new_pos);
_renderManager->setBackgroundPosition(new_pos);
} else if (renderState == RenderTable::TILT) {
int16 st_pos = _scriptManager->getStateValue(StateKey_ViewPos);
@@ -398,7 +397,6 @@ void ZVision::updateRotation() {
if (new_pos <= tilt_gap)
new_pos = tilt_gap;
- _scriptManager->setStateValue(StateKey_ViewPos, new_pos);
_renderManager->setBackgroundPosition(new_pos);
}
}