aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorMartin Kiewitz2010-01-15 21:32:18 +0000
committerMartin Kiewitz2010-01-15 21:32:18 +0000
commit8689f1d8cc6a9684cb1c45a9d7f5016aac00f4c6 (patch)
tree75c3d4f57442d1c85373aa837658cb878a99daf4 /engines/sci
parent0dddf869fb2e358d425579f1ee37c46057a6ce08 (diff)
downloadscummvm-rg350-8689f1d8cc6a9684cb1c45a9d7f5016aac00f4c6.tar.gz
scummvm-rg350-8689f1d8cc6a9684cb1c45a9d7f5016aac00f4c6.tar.bz2
scummvm-rg350-8689f1d8cc6a9684cb1c45a9d7f5016aac00f4c6.zip
SCI: added enum for ScaleSignal
svn-id: r47313
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/graphics/animate.cpp9
-rw-r--r--engines/sci/graphics/animate.h6
2 files changed, 13 insertions, 2 deletions
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp
index ea86879572..1a31dccefb 100644
--- a/engines/sci/graphics/animate.cpp
+++ b/engines/sci/graphics/animate.cpp
@@ -161,8 +161,13 @@ void SciGuiAnimate::makeSortedList(List *list) {
if (getSciVersion() >= SCI_VERSION_1_1) {
// Cel scaling
listEntry->scaleSignal = GET_SEL32V(_s->_segMan, curObject, scaleSignal);
- listEntry->scaleX = GET_SEL32V(_s->_segMan, curObject, scaleX);
- listEntry->scaleY = GET_SEL32V(_s->_segMan, curObject, scaleY);
+ if (listEntry->scaleSignal & kScaleSignalDoScaling) {
+ listEntry->scaleX = GET_SEL32V(_s->_segMan, curObject, scaleX);
+ listEntry->scaleY = GET_SEL32V(_s->_segMan, curObject, scaleY);
+ } else {
+ listEntry->scaleX = 128;
+ listEntry->scaleY = 128;
+ }
} else {
listEntry->scaleSignal = 0;
listEntry->scaleX = 128;
diff --git a/engines/sci/graphics/animate.h b/engines/sci/graphics/animate.h
index 599c093d6d..697ac7ea14 100644
--- a/engines/sci/graphics/animate.h
+++ b/engines/sci/graphics/animate.h
@@ -50,6 +50,12 @@ enum ViewSignals {
kSignalDisposeMe = 0x8000
};
+enum ViewScaleSignals {
+ kScaleSignalDoScaling = 0x0001, // enables scaling when drawing that cel (involves scaleX and scaleY)
+ kScaleSignalUnknown1 = 0x0002, // seems to do something with a globalvar
+ kScaleSignalUnknown2 = 0x0004 // really unknown
+};
+
class Gfx;
class Screen;
class SciPalette;