diff options
| author | Martin Kiewitz | 2010-01-15 21:26:02 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-15 21:26:02 +0000 |
| commit | 0dddf869fb2e358d425579f1ee37c46057a6ce08 (patch) | |
| tree | 18833e2fd90a66ffe5fcc6bf4da32233788b14d4 /engines | |
| parent | edb9487df58db906c30d2ac0f3338a9adb5951cb (diff) | |
| download | scummvm-rg350-0dddf869fb2e358d425579f1ee37c46057a6ce08.tar.gz scummvm-rg350-0dddf869fb2e358d425579f1ee37c46057a6ce08.tar.bz2 scummvm-rg350-0dddf869fb2e358d425579f1ee37c46057a6ce08.zip | |
SCI: changed scalesignal to scaleSignal - selector works now :)
svn-id: r47312
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/script.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/static_selectors.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/engine/vm.h | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/animate.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/script.cpp b/engines/sci/engine/script.cpp index 43768507c2..70b638a43f 100644 --- a/engines/sci/engine/script.cpp +++ b/engines/sci/engine/script.cpp @@ -235,7 +235,7 @@ void Kernel::mapSelectors() { FIND_SELECTOR(overlay); FIND_SELECTOR(setCursor); FIND_SELECTOR(topString); - FIND_SELECTOR(scalesignal); + FIND_SELECTOR(scaleSignal); FIND_SELECTOR(scaleX); FIND_SELECTOR(scaleY); diff --git a/engines/sci/engine/static_selectors.cpp b/engines/sci/engine/static_selectors.cpp index c332f92411..4a783a0fa3 100644 --- a/engines/sci/engine/static_selectors.cpp +++ b/engines/sci/engine/static_selectors.cpp @@ -71,7 +71,7 @@ static const SelectorRemap sciSelectorRemap[] = { { SCI_VERSION_1_EARLY, SCI_VERSION_1_1, "cantBeHere", 57 }, { SCI_VERSION_1_EARLY, SCI_VERSION_1_1, "topString", 101 }, { SCI_VERSION_1_EARLY, SCI_VERSION_1_1, "flags", 102 }, - { SCI_VERSION_1_1, SCI_VERSION_1_1,"scalesignal", 103 }, + { SCI_VERSION_1_1, SCI_VERSION_1_1,"scaleSignal", 103 }, { SCI_VERSION_1_1, SCI_VERSION_1_1, "scaleX", 104 }, { SCI_VERSION_1_1, SCI_VERSION_1_1, "scaleY", 105 }, { SCI_VERSION_NONE, SCI_VERSION_NONE, 0, 0 } diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h index ebd05bab8e..2928ff4daa 100644 --- a/engines/sci/engine/vm.h +++ b/engines/sci/engine/vm.h @@ -190,7 +190,7 @@ struct SelectorCache { Selector syncTime; // SCI1.1 specific selectors - Selector scalesignal; // < Used by Animate() for cel scaling (SCI1.1+) + Selector scaleSignal; // < Used by Animate() for cel scaling (SCI1.1+) Selector scaleX, scaleY; ///< SCI1.1 view scaling // Used for auto detection purposes diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp index 004db1712f..ea86879572 100644 --- a/engines/sci/graphics/animate.cpp +++ b/engines/sci/graphics/animate.cpp @@ -160,7 +160,7 @@ void SciGuiAnimate::makeSortedList(List *list) { listEntry->signal = GET_SEL32V(_s->_segMan, curObject, signal); if (getSciVersion() >= SCI_VERSION_1_1) { // Cel scaling - listEntry->scaleSignal = GET_SEL32V(_s->_segMan, curObject, scalesignal); + listEntry->scaleSignal = GET_SEL32V(_s->_segMan, curObject, scaleSignal); listEntry->scaleX = GET_SEL32V(_s->_segMan, curObject, scaleX); listEntry->scaleY = GET_SEL32V(_s->_segMan, curObject, scaleY); } else { |