aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMatthew Hoops2010-01-05 01:14:08 +0000
committerMatthew Hoops2010-01-05 01:14:08 +0000
commitd8c59f5baa386a6baaf62685b794c2531b9cdd64 (patch)
treecbcc74082441434a770c745739c8f947f082502b /engines
parentf66d5a7f534ad2869aecfcacc90bf337cc33571e (diff)
downloadscummvm-rg350-d8c59f5baa386a6baaf62685b794c2531b9cdd64.tar.gz
scummvm-rg350-d8c59f5baa386a6baaf62685b794c2531b9cdd64.tar.bz2
scummvm-rg350-d8c59f5baa386a6baaf62685b794c2531b9cdd64.zip
Disable the planeLeft/planeTop code as it doesn't work under the current code (and left a FIXME explaining why it doesn't work).
svn-id: r47006
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/gui/gui.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp
index 8189aea4d6..9377d439bf 100644
--- a/engines/sci/gui/gui.cpp
+++ b/engines/sci/gui/gui.cpp
@@ -875,9 +875,14 @@ void SciGui::frameOut() {
if (priority == -1)
continue;
-
- int16 planeTop = GET_SEL32V(_s->_segMan, planeObj, top);
- int16 planeLeft = GET_SEL32V(_s->_segMan, planeObj, left);
+
+ // FIXME: This code doesn't currently work properly because of the way we set up the
+ // view port. We are starting at 10 pixels from the top automatically. The offset should
+ // be based on the plane's top in SCI32 instead. Here we would be adding 10 to 10 and
+ // therefore drawing too low. We would need to draw each picture at the correct offset
+ // which doesn't currently happen.
+ //int16 planeTop = GET_SEL32V(_s->_segMan, planeObj, top);
+ //int16 planeLeft = GET_SEL32V(_s->_segMan, planeObj, left);
for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
reg_t viewObj = _screenItems[itemNr];
@@ -891,8 +896,9 @@ void SciGui::frameOut() {
priority = GET_SEL32V(_s->_segMan, viewObj, priority);
//int16 signal = GET_SEL32V(_s->_segMan, viewObj, signal);
- leftPos += planeLeft;
- topPos += planeTop;
+ // FIXME: See above
+ //leftPos += planeLeft;
+ //topPos += planeTop;
// Theoretically, leftPos and topPos should be sane
// Apparently, sometimes they're not, therefore I'm adding some sanity checks here so that