[Scummvm-cvs-logs] CVS: scummvm boxes.cpp,1.8,1.9 script_v1.cpp,1.21,1.22 string.cpp,1.17,1.18

James Brown ender at users.sourceforge.net
Thu Feb 14 04:58:07 CET 2002


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

Modified Files:
	boxes.cpp script_v1.cpp string.cpp 
Log Message:
Some small Zak256 fixes.



Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** boxes.cpp	12 Feb 2002 21:28:06 -0000	1.8
--- boxes.cpp	14 Feb 2002 12:57:29 -0000	1.9
***************
*** 460,464 ****
  		box2.lr = tmp;
  	}
! 	error("findPathTowards: default");
  }
  void Scumm::setBoxFlags(int box, int val) {
--- 460,464 ----
  		box2.lr = tmp;
  	}
! 	warning("findPathTowards: default"); // FIXME: ZAK256
  }
  void Scumm::setBoxFlags(int box, int val) {

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** script_v1.cpp	13 Feb 2002 20:16:01 -0000	1.21
--- script_v1.cpp	14 Feb 2002 12:57:29 -0000	1.22
***************
*** 1893,1896 ****
--- 1893,1897 ----
  		return;
  	case 2: /* wait for message */
+ 		if (_gameId == GID_ZAK256) return;	// FIXME: ZAK256
  		if (_vars[VAR_HAVE_MSG])
  			break;
***************
*** 2099,2103 ****
  	int obj;
  
! 	obj = getVarOrDirectByte(0x80);
  
  	if(getObjectIndex(obj) != 1)
--- 2100,2104 ----
  	int obj;
  
!         obj = getVarOrDirectWord(0x80);
  
  	if(getObjectIndex(obj) != 1)

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** string.cpp	13 Feb 2002 17:33:52 -0000	1.17
--- string.cpp	14 Feb 2002 12:57:29 -0000	1.18
***************
*** 184,191 ****
  	int frme;
  	Actor *a;
! 	byte *buffer;
! 
! 	if(_gameId==GID_ZAK256)
! 		return;
  
  #if !defined(FULL_THROTTLE)
--- 184,188 ----
  	int frme;
  	Actor *a;
! 	byte *buffer;	
  
  #if !defined(FULL_THROTTLE)
***************
*** 289,293 ****
  
  	buffer = charset._buffer + charset._bufPos;
! 	
  	charset.addLinebreaks(0, buffer,0, t);
  
--- 286,293 ----
  
  	buffer = charset._buffer + charset._bufPos;
! 	if(_gameId==GID_ZAK256) {
! 		debug(1, "CHARSET_1: %s", buffer);
! 		return;
! 	}
  	charset.addLinebreaks(0, buffer,0, t);
  





More information about the Scummvm-git-logs mailing list