thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed "SCALLING" to "SCALING".

Browse source 
svn-id: r9134
This commit is contained in:
Torbjörn Andersson 2003-07-22 20:53:01 +00:00
parent 7665890d97
commit 3b033956aa
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scumm/actor.cpp
View file

@ -376,7 +376,7 @@ int Actor::actorWalkStep() {
void Actor::setupActorScale() { void Actor::setupActorScale() {
uint16 scale; uint16 scale;
if (_vm->_features & GF_NO_SCALLING) { if (_vm->_features & GF_NO_SCALING) {
scalex = 0xFF; scalex = 0xFF;
scaley = 0xFF; scaley = 0xFF;
return; return;

4
scumm/boxes.cpp
View file

@ -149,7 +149,7 @@ void Scumm::setBoxScaleSlot(int box, int slot) {
} }
int Scumm::getScale(int box, int x, int y) { int Scumm::getScale(int box, int x, int y) {
if (_features & GF_NO_SCALLING) if (_features & GF_NO_SCALING)
return 255; return 255;
Box *ptr = getBoxBaseAddr(box); Box *ptr = getBoxBaseAddr(box);
@ -205,7 +205,7 @@ int Scumm::getScale(int box, int x, int y) {
} }
int Scumm::getBoxScale(int box) { int Scumm::getBoxScale(int box) {
if (_features & GF_NO_SCALLING) if (_features & GF_NO_SCALING)
return 255; return 255;
Box *ptr = getBoxBaseAddr(box); Box *ptr = getBoxBaseAddr(box);
if (!ptr) if (!ptr)

2
scumm/scumm.h
View file

@ -79,7 +79,7 @@ enum GameFeatures {
GF_16COLOR = 1 << 9, GF_16COLOR = 1 << 9,
GF_OLD256 = 1 << 10, GF_OLD256 = 1 << 10,
GF_AUDIOTRACKS = 1 << 11, GF_AUDIOTRACKS = 1 << 11,
GF_NO_SCALLING = 1 << 12, GF_NO_SCALING = 1 << 12,
GF_ADLIB_DEFAULT = 1 << 13, GF_ADLIB_DEFAULT = 1 << 13,
GF_AMIGA = 1 << 14, GF_AMIGA = 1 << 14,
GF_HUMONGOUS = 1 << 15, GF_HUMONGOUS = 1 << 15,

14
scumm/scummvm.cpp
View file

@ -72,21 +72,21 @@ static const VersionSettings scumm_settings[] = {
/* Scumm Version 2 */ /* Scumm Version 2 */
{"maniac", "Maniac Mansion", GID_MANIAC, 2, VersionSettings::ADLIB_ALWAYS, {"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, {"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 */ /* Scumm Version 3 */
{"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3, VersionSettings::ADLIB_ALWAYS, {"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, {"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, {"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, {"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, {"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 */ /* Scumm Version 4 */
{"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS, {"monkeyEGA", "Monkey Island 1 (EGA)", GID_MONKEY_EGA, 4, VersionSettings::ADLIB_ALWAYS,