[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.49,1.50 boxes.cpp,1.23,1.24

Vincent Hamm yazoo at users.sourceforge.net
Wed Apr 17 14:45:05 CEST 2002


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

Modified Files:
	actor.cpp boxes.cpp 
Log Message:
Forced masking for box 0. Correct a few things. Bobbin is buggy when starting a new game in Loom, but that's the consequence of another bug.

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** actor.cpp	11 Apr 2002 20:10:46 -0000	1.49
--- actor.cpp	17 Apr 2002 21:44:19 -0000	1.50
***************
*** 252,257 ****
  void Scumm::setActorBox(Actor * a, int box)
  {
! 	a->walkbox = box;
! 	a->mask = getMaskFromBox(box);
  	setupActorScale(a);
  }
--- 252,260 ----
  void Scumm::setActorBox(Actor * a, int box)
  {
! 	a->walkbox = box;
! 	if(box == 0)
! 		a->mask = 1;
! 	else
! 		a->mask = getMaskFromBox(box);
  	setupActorScale(a);
  }

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** boxes.cpp	11 Apr 2002 17:19:14 -0000	1.23
--- boxes.cpp	17 Apr 2002 21:44:19 -0000	1.24
***************
*** 29,33 ****
  	Box *ptr = getBoxBaseAddr(box);
  	if (!ptr)
! 		return 0;
  	return ptr->mask;
  }
--- 29,33 ----
  	Box *ptr = getBoxBaseAddr(box);
  	if (!ptr)
! 		return 0;
  	return ptr->mask;
  }





More information about the Scummvm-git-logs mailing list