aboutsummaryrefslogtreecommitdiff
path: root/engines/simon
diff options
context:
space:
mode:
authorTravis Howell2006-03-16 05:41:39 +0000
committerTravis Howell2006-03-16 05:41:39 +0000
commitec05842572a0b82b19a7baadfd9d408828855ce9 (patch)
tree80dc7a5b764cd6a89d1d199d889611ed1631c7ad /engines/simon
parent5b3b3b21e3daf2654e64bc640463d851689177cd (diff)
downloadscummvm-rg350-ec05842572a0b82b19a7baadfd9d408828855ce9.tar.gz
scummvm-rg350-ec05842572a0b82b19a7baadfd9d408828855ce9.tar.bz2
scummvm-rg350-ec05842572a0b82b19a7baadfd9d408828855ce9.zip
Remove duplicate fcs field
svn-id: r21326
Diffstat (limited to 'engines/simon')
-rw-r--r--engines/simon/intern.h3
-rw-r--r--engines/simon/oracle.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/engines/simon/intern.h b/engines/simon/intern.h
index 9088da9c30..523a588135 100644
--- a/engines/simon/intern.h
+++ b/engines/simon/intern.h
@@ -90,8 +90,7 @@ struct FillOrCopyStruct {
uint16 x, y;
uint16 width, height;
uint16 textColumn, textRow;
- uint16 scrollY;
- uint8 textColumnOffset, textLength, textMaxLength;
+ uint16 textColumnOffset, textLength, textMaxLength;
uint8 fill_color, text_color, unk5;
FillOrCopyData *fcs_data;
FillOrCopyStruct() { memset(this, 0, sizeof(*this)); }
diff --git a/engines/simon/oracle.cpp b/engines/simon/oracle.cpp
index 319b1209f9..eadfee6ce8 100644
--- a/engines/simon/oracle.cpp
+++ b/engines/simon/oracle.cpp
@@ -37,7 +37,7 @@ void SimonEngine::hyperLinkOn(uint16 x)
_hyperLink = x;
_variableArray[50] = _textWindow->textColumn+_textWindow->x;
_variableArray[51] = _textWindow->textRow+_textWindow->y+
- (_oracleMaxScrollY - _textWindow->scrollY) * 15;
+ (_oracleMaxScrollY - _textWindow->textColumnOffset) * 15;
}