[Scummvm-cvs-logs] CVS: scummvm script.cpp,1.42,1.43

[James Brown]

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

Modified Files:
	script.cpp 
Log Message:
Hopefully fix these cutscene bugs for good.



Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** script.cpp	5 Apr 2002 17:18:57 -0000	1.42
--- script.cpp	6 Apr 2002 01:14:42 -0000	1.43
***************
*** 757,770 ****
  
  	memset(args, 0, sizeof(args));	
! 	if (ss->cutsceneOverride < 1)
! 		return;
  	
- 	ss->cutsceneOverride--;	
- 	printf("Ending cs(%d) from %d\n", ss->cutsceneOverride, _currentScript);
  	args[0] = vm.cutSceneData[vm.cutSceneStackPointer];
  	_vars[VAR_OVERRIDE] = 0;
  
  	csptr = &vm.cutScenePtr[vm.cutSceneStackPointer];
! 	if (*csptr)
  		ss->cutsceneOverride--;
  
--- 757,769 ----
  
  	memset(args, 0, sizeof(args));	
! 
! 	if (ss->cutsceneOverride > 0)	// Only terminate if active
! 		ss->cutsceneOverride--;	
  	
  	args[0] = vm.cutSceneData[vm.cutSceneStackPointer];
  	_vars[VAR_OVERRIDE] = 0;
  
  	csptr = &vm.cutScenePtr[vm.cutSceneStackPointer];
! 	if (*csptr && (ss->cutsceneOverride > 0))	// Only terminate if active
  		ss->cutsceneOverride--;
  
***************
*** 780,784 ****
  	int scr = _currentScript;
  	vm.slot[scr].cutsceneOverride++;
! 	printf("Starting cs(%d) from %d\n", vm.slot[scr].cutsceneOverride, _currentScript);
  	if (++vm.cutSceneStackPointer > sizeof(vm.cutSceneData)/sizeof(vm.cutSceneData[0]))
  		error("Cutscene stack overflow");
--- 779,783 ----
  	int scr = _currentScript;
  	vm.slot[scr].cutsceneOverride++;
! 	
  	if (++vm.cutSceneStackPointer > sizeof(vm.cutSceneData)/sizeof(vm.cutSceneData[0]))
  		error("Cutscene stack overflow");