[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.142,1.143 boxes.cpp,1.52,1.53 scummvm.cpp,2.296,2.297 scumm.h,1.273,1.274

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Tue Jul 22 13:54:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv5371

Modified Files:
	actor.cpp boxes.cpp scummvm.cpp scumm.h 
Log Message:
Changed "SCALLING" to "SCALING".


Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- actor.cpp	21 Jul 2003 21:59:07 -0000	1.142
+++ actor.cpp	22 Jul 2003 20:53:01 -0000	1.143
@@ -376,7 +376,7 @@
 void Actor::setupActorScale() {
 	uint16 scale;
 
-	if (_vm->_features & GF_NO_SCALLING) {
+	if (_vm->_features & GF_NO_SCALING) {
 		scalex = 0xFF;
 		scaley = 0xFF;
 		return;

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- boxes.cpp	22 Jul 2003 19:01:38 -0000	1.52
+++ boxes.cpp	22 Jul 2003 20:53:01 -0000	1.53
@@ -149,7 +149,7 @@
 }
 
 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::getBoxScale(int box) {
-	if (_features & GF_NO_SCALLING)
+	if (_features & GF_NO_SCALING)
 		return 255;
 	Box *ptr = getBoxBaseAddr(box);
 	if (!ptr)

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.296
retrieving revision 2.297
diff -u -d -r2.296 -r2.297
--- scummvm.cpp	22 Jul 2003 01:03:10 -0000	2.296
+++ scummvm.cpp	22 Jul 2003 20:53:01 -0000	2.297
@@ -72,21 +72,21 @@
 	/* 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,

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- scumm.h	21 Jul 2003 21:28:47 -0000	1.273
+++ scumm.h	22 Jul 2003 20:53:01 -0000	1.274
@@ -79,7 +79,7 @@
 	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,





More information about the Scummvm-git-logs mailing list