[Scummvm-cvs-logs] CVS: scummvm script_v2.cpp,1.14,1.15 script.cpp,1.13,1.14

[Ludvig Strigeus]

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

Modified Files:
	script_v2.cpp script.cpp 
Log Message:
fixed two bugs reported by lionel ulmer

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** script_v2.cpp	2001/11/27 17:56:04	1.14
--- script_v2.cpp	2001/12/02 20:39:03	1.15
***************
*** 1275,1279 ****
  		break;
  	case 119:/* load fl object */
! 		loadFlObject(pop(), (_features & GF_HAS_ROOMTABLE) ? -1 : pop());
  		break;
  	default:
--- 1275,1280 ----
  		break;
  	case 119:/* load fl object */
! 		res = (_features & GF_HAS_ROOMTABLE) ? -1 : pop();
! 		loadFlObject(pop(), res);
  		break;
  	default:

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** script.cpp	2001/12/01 17:06:13	1.13
--- script.cpp	2001/12/02 20:39:03	1.14
***************
*** 717,726 ****
  
  void Scumm::push(int a) {
! 	assert(_scummStackPos >=0 && _scummStackPos < sizeof(_scummStack)-1);
  	_scummStack[_scummStackPos++] = a;	
  }
  
  int Scumm::pop() {
! 	assert(_scummStackPos >0 && _scummStackPos < sizeof(_scummStack));
  	return _scummStack[--_scummStackPos];
  }
--- 717,726 ----
  
  void Scumm::push(int a) {
! 	assert(_scummStackPos >=0 && _scummStackPos < ARRAYSIZE(_scummStack)-1);
  	_scummStack[_scummStackPos++] = a;	
  }
  
  int Scumm::pop() {
! 	assert(_scummStackPos >0 && _scummStackPos < ARRAYSIZE(_scummStack));
  	return _scummStack[--_scummStackPos];
  }