[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.52,1.53 costume.cpp,1.27,1.28

James Brown ender at users.sourceforge.net
Sun Apr 21 02:21:02 CEST 2002


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

Modified Files:
	actor.cpp costume.cpp 
Log Message:
Add fixme hack to room 17 FOA cost animation.
Remove \M from costume.cpp - how do these get here?!?! :)



Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** actor.cpp	18 Apr 2002 15:34:45 -0000	1.52
--- actor.cpp	21 Apr 2002 09:20:38 -0000	1.53
***************
*** 228,238 ****
  	int dirType;
  	int num;
! 
  	dirType = akos_hasManyDirections(a);
  
  	from = toSimpleDir(dirType, a->facing);
  	to = toSimpleDir(dirType, remapDirection(a, a->newDirection));
! 	diff = to - from;
! 
  	num = numSimpleDirDirections(dirType);
  
--- 228,237 ----
  	int dirType;
  	int num;
! 	
  	dirType = akos_hasManyDirections(a);
  
  	from = toSimpleDir(dirType, a->facing);
  	to = toSimpleDir(dirType, remapDirection(a, a->newDirection));
! 	diff = to - from;	
  	num = numSimpleDirDirections(dirType);
  
***************
*** 357,361 ****
  void Scumm::startAnimActor(Actor * a, int frame)
  {
! 	if (_features & GF_NEW_COSTUMES) {
  		switch (frame) {
  		case 1001:
--- 356,360 ----
  void Scumm::startAnimActor(Actor * a, int frame)
  {
! 	if (_features & GF_NEW_COSTUMES) {		
  		switch (frame) {
  		case 1001:
***************
*** 405,408 ****
--- 404,412 ----
  			a->cost.animCounter1 = 0;
  			a->needRedraw = true;
+ 
+ 			// FIXME: FOA hack, room 17, climbing off machine
+ 			if (_gameId == GID_INDY4 && a->costume == 27) {
+ 				a->facing = 0;
+ 			}
  
  			if (a->initFrame == frame)

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** costume.cpp	20 Apr 2002 09:30:03 -0000	1.27
--- costume.cpp	21 Apr 2002 09:20:38 -0000	1.28
***************
*** 702,708 ****
  	byte shadow4;
  	byte shadow5;
! 
! 	if(a->costume==153) //Samnmax elevator FIXME
! 		return;
  
  	shadow1=a->shadow_mode & 0x80;
--- 702,711 ----
  	byte shadow4;
  	byte shadow5;
! 
! 
! 	if(a->costume==153) //Samnmax elevator FIXME
! 
! 		return;
! 
  
  	shadow1=a->shadow_mode & 0x80;





More information about the Scummvm-git-logs mailing list