[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.57,1.58 scumm.h,1.106,1.107

[Nicolas Bacca]

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

Modified Files:
	script_v1.cpp scumm.h 
Log Message:
Reswitched getVarOrDirectByte/Word to SIGNED int - fixes some disappearing objects problem due to an invalid elevation. Please yell if it breaks something else :)

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** script_v1.cpp	24 Mar 2002 17:49:46 -0000	1.57
--- script_v1.cpp	31 Mar 2002 08:35:42 -0000	1.58
***************
*** 2410,2420 ****
  }
  
! uint Scumm::getVarOrDirectWord(byte mask) {
  	if (_opcode&mask)
  		return readVar(fetchScriptWord());
! 	return (uint16)fetchScriptWord();
  }
  
! uint Scumm::getVarOrDirectByte(byte mask) {
  	if (_opcode&mask)
  		return readVar(fetchScriptWord());
--- 2410,2420 ----
  }
  
! int Scumm::getVarOrDirectWord(byte mask) {
  	if (_opcode&mask)
  		return readVar(fetchScriptWord());
! 	return (int16)fetchScriptWord();
  }
  
! int Scumm::getVarOrDirectByte(byte mask) {
  	if (_opcode&mask)
  		return readVar(fetchScriptWord());

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** scumm.h	29 Mar 2002 12:15:41 -0000	1.106
--- scumm.h	31 Mar 2002 08:35:42 -0000	1.107
***************
*** 737,742 ****
  	void ignoreScriptWord() { fetchScriptWord(); }
  	void ignoreScriptByte() { fetchScriptByte(); }
! 	uint getVarOrDirectWord(byte mask);
! 	uint getVarOrDirectByte(byte mask);
  	void getResultPos();
  	void setResult(int result);
--- 737,742 ----
  	void ignoreScriptWord() { fetchScriptWord(); }
  	void ignoreScriptByte() { fetchScriptByte(); }
! 	int getVarOrDirectWord(byte mask);
! 	int getVarOrDirectByte(byte mask);
  	void getResultPos();
  	void setResult(int result);