diff options
| author | Torbjörn Andersson | 2003-07-22 20:53:01 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2003-07-22 20:53:01 +0000 |
| commit | 3b033956aa08b0e90ae6bb30b6ecd690926cc4ab (patch) | |
| tree | 317cde02b9a0df6a8d2e4b8353cee7a98498fa93 /scumm | |
| parent | 7665890d9738b14180d03e0f6de34851b932b572 (diff) | |
| download | scummvm-rg350-3b033956aa08b0e90ae6bb30b6ecd690926cc4ab.tar.gz scummvm-rg350-3b033956aa08b0e90ae6bb30b6ecd690926cc4ab.tar.bz2 scummvm-rg350-3b033956aa08b0e90ae6bb30b6ecd690926cc4ab.zip | |
Changed "SCALLING" to "SCALING".
svn-id: r9134
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | scumm/boxes.cpp | 4 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 14 |
4 files changed, 11 insertions, 11 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 00c3e01021..f63668d2ca 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -376,7 +376,7 @@ int Actor::actorWalkStep() { void Actor::setupActorScale() { uint16 scale; - if (_vm->_features & GF_NO_SCALLING) { + if (_vm->_features & GF_NO_SCALING) { scalex = 0xFF; scaley = 0xFF; return; diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index 64d0dcd405..f46c68d6a5 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -149,7 +149,7 @@ void Scumm::setBoxScaleSlot(int box, int slot) { } int Scumm::getScale(int box, int x, int y) { - if (_features & GF_NO_SCALLING) + if (_features & GF_NO_SCALING) return 255; Box *ptr = getBoxBaseAddr(box); @@ -205,7 +205,7 @@ int Scumm::getScale(int box, int x, int y) { } int Scumm::getBoxScale(int box) { - if (_features & GF_NO_SCALLING) + if (_features & GF_NO_SCALING) return 255; Box *ptr = getBoxBaseAddr(box); if (!ptr) diff --git a/scumm/scumm.h b/scumm/scumm.h index 1fa4620bdf..6f85d6bb76 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -79,7 +79,7 @@ enum GameFeatures { GF_16COLOR = 1 << 9, GF_OLD256 = 1 << 10, GF_AUDIOTRACKS = 1 << 11, - GF_NO_SCALLING = 1 << 12, + GF_NO_SCALING = 1 << 12, GF_ADLIB_DEFAULT = 1 << 13, GF_AMIGA = 1 << 14, GF_HUMONGOUS = 1 << 15, diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 79b5010eeb..80f6e33ca8 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -72,21 +72,21 @@ static const VersionSettings scumm_settings[] = { /* Scumm Version 2 */ {"maniac", "Maniac Mansion", GID_MANIAC, 2, VersionSettings::ADLIB_ALWAYS, - GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"}, + GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, "00.LFL"}, {"zak", "Zak McKracken and the Alien Mindbenders", GID_ZAK, 2, VersionSettings::ADLIB_ALWAYS, - GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALLING, "00.LFL"}, + GF_SMALL_HEADER | GF_USE_KEY | GF_SMALL_NAMES | GF_16COLOR | GF_OLD_BUNDLE | GF_NO_SCALING, "00.LFL"}, /* Scumm Version 3 */ {"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3, VersionSettings::ADLIB_ALWAYS, - GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"}, + GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"}, {"indy3Towns", "Indiana Jones and the Last Crusade (FM Towns)", GID_INDY3_TOWNS, 3, VersionSettings::ADLIB_ALWAYS, - GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"}, + GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"}, {"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3_256, 3, VersionSettings::ADLIB_ALWAYS, - GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_ADLIB_DEFAULT, "00.LFL"}, + GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_ADLIB_DEFAULT, "00.LFL"}, {"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, VersionSettings::ADLIB_ALWAYS, - GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"}, + GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_OLD256 | GF_FMTOWNS | GF_AUDIOTRACKS, "00.LFL"}, {"loom", "Loom", GID_LOOM, 3, VersionSettings::ADLIB_ALWAYS, - GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"}, + GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"}, /* Scumm Version 4 */ {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS, |