[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.23,1.24 script_v1.cpp,1.30,1.31 scumm.h,1.46,1.47 scummvm.cpp,1.39,1.40

[Vincent Hamm]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv27642

Modified Files:
	actor.cpp script_v1.cpp scumm.h scummvm.cpp 
Log Message:
Fixed actor scalling in Zak and indy3

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** actor.cpp	13 Feb 2002 17:33:52 -0000	1.23
--- actor.cpp	15 Feb 2002 13:11:50 -0000	1.24
***************
*** 304,307 ****
--- 304,313 ----
  	int y;
  
+ 	if (_features & GF_NO_SCALLING) {
+ 		a->scalex = 0xFF;
+ 		a->scaley = 0xFF;
+ 		return;
+ 	}
+ 	
  	if (a->ignoreBoxes != 0)
  		return;

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** script_v1.cpp	15 Feb 2002 06:42:40 -0000	1.30
--- script_v1.cpp	15 Feb 2002 13:11:51 -0000	1.31
***************
*** 113,117 ****
  	/* 44 */
  	&Scumm::o5_isLess,
! 	&Scumm::o5_badOpcode,
  	&Scumm::o5_increment,
  	&Scumm::o5_setState,
--- 113,117 ----
  	/* 44 */
  	&Scumm::o5_isLess,
! 	&Scumm::o5_drawObject,
  	&Scumm::o5_increment,
  	&Scumm::o5_setState,
***************
*** 1214,1217 ****
--- 1214,1221 ----
  
  void Scumm::o5_getActorScale() {
+ 	if(_gameId == GID_INDY3_256) {
+ 		getVarOrDirectByte(0x80); /*FIXME: missing stuff here*/
+ 		return;
+ 	}
  	getResultPos();
  	setResult(derefActorSafe(getVarOrDirectByte(0x80),"o5_getActorScale")->scalex);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** scumm.h	15 Feb 2002 06:42:41 -0000	1.46
--- scumm.h	15 Feb 2002 13:11:51 -0000	1.47
***************
*** 934,937 ****
--- 934,938 ----
  	GF_OLD256 = 512,
  	GF_AUDIOTRACKS = 1024,
+ 	GF_NO_SCALLING = 2048,
  };
  

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** scummvm.cpp	14 Feb 2002 15:06:32 -0000	1.39
--- scummvm.cpp	15 Feb 2002 13:11:51 -0000	1.40
***************
*** 436,442 ****
  
          /* Scumm Version 3 */
!         {"indy3",       "Indiana Jones and the Last Crusade (256)",     GID_INDY3_256,  3, 0, 22, GF_SMALL_HEADER|GF_USE_KEY|GF_SMALL_NAMES|GF_OLD256},
!         {"zak256",      "Zak McKracken and the Alien Mindbenders (256)",GID_ZAK256,     3, 0, 0,  GF_SMALL_HEADER|GF_USE_KEY|GF_SMALL_NAMES|GF_OLD256|GF_AUDIOTRACKS},
!         {"loom",        "Loom",                                         GID_LOOM,       3, 5, 40, GF_SMALL_HEADER|GF_USE_KEY|GF_SMALL_NAMES|GF_OLD_BUNDLE|GF_16COLOR},
  
          /* Scumm Version 4 */
--- 436,442 ----
  
          /* Scumm Version 3 */
!         {"indy3",       "Indiana Jones and the Last Crusade (256)",     GID_INDY3_256,  3, 0, 22, GF_SMALL_HEADER|GF_USE_KEY|GF_SMALL_NAMES|GF_OLD256|GF_NO_SCALLING},
!         {"zak256",      "Zak McKracken and the Alien Mindbenders (256)",GID_ZAK256,     3, 0, 0,  GF_SMALL_HEADER|GF_USE_KEY|GF_SMALL_NAMES|GF_OLD256|GF_AUDIOTRACKS|GF_NO_SCALLING},
!         {"loom",        "Loom",                                         GID_LOOM,       3, 5, 40, GF_SMALL_HEADER|GF_USE_KEY|GF_SMALL_NAMES|GF_OLD_BUNDLE|GF_16COLOR|GF_NO_SCALLING},
  
          /* Scumm Version 4 */