[Scummvm-cvs-logs] CVS: scummvm sdl.cpp,1.54,1.55

[James Brown]

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

Modified Files:
	sdl.cpp 
Log Message:
A few more things, still very much broken.



Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** sdl.cpp	24 Mar 2002 16:35:17 -0000	1.54
--- sdl.cpp	24 Mar 2002 16:52:59 -0000	1.55
***************
*** 65,69 ****
  	SDL_Color colors[256];
  	int first = s->_palDirtyMin;
! 	int num = s->_palDirtyMax - first + 1;
  	int i;
  	byte *data = s->_currentPalette;
--- 65,69 ----
  	SDL_Color colors[256];
  	int first = s->_palDirtyMin;
! 	int num = (s->_palDirtyMax) - first + 1;
  	int i;
  	byte *data = s->_currentPalette;
***************
*** 980,985 ****
  	scumm->_verbMouseOver=0;
  
! 	scumm->_palDirtyMax=0;
! 	scumm->_palDirtyMin=0;
  	scumm->_debugger=0;
  	scumm->camera._cur.x=0;
--- 980,985 ----
  	scumm->_verbMouseOver=0;
  
! 	scumm->_palDirtyMax=-1;
! 	scumm->_palDirtyMin=-1;
  	scumm->_debugger=0;
  	scumm->camera._cur.x=0;
***************
*** 999,1003 ****
--- 999,1008 ----
  	scumm->mouse.x=0;
  	scumm->mouse.y=0;
+ 	
+ 	scumm->_xPos = 0;
+ 	scumm->_yPos = 0;
+ 	scumm->_dir = 0;
  
+ 	scumm->_resultVarNumber = 0;
  	scumm->delta=0;
  	scumm->_soundEngine=0;
***************
*** 1016,1019 ****
--- 1021,1026 ----
  
  	scumm->_talk_sound_mode=0;
+ 	scumm->_talk_sound_a = 0;
+ 	scumm->_talk_sound_b = 0;
  
  	scumm->_curActor = 0;
***************
*** 1025,1032 ****
--- 1032,1061 ----
  	scumm->_currentRoom = 0;
  
+ 	scumm->_midi_driver = 0;
+ 	scumm->_curSoundPos = 0;
  	scumm->_soundQuePos = 0;	
  	scumm->_soundQue2Pos = 0;
+ 	scumm->_soundParam = 0;
+ 	scumm->_soundParam2 = 0;
+ 	scumm->_soundParam3 = 0;
+ 	scumm->current_cd_sound = 0;
+ 	scumm->num_sound_effects = 0;
+ 	scumm->_noSubtitles = 0;
  
  	scumm->_screenEffectFlag = 0;
+ 	scumm->_switchRoomEffect = 0;
+ 	scumm->_switchRoomEffect2 = 0;
+ 	scumm->_screenLeft = 0;
+ 	scumm->_screenTop = 0;
+ 
+ 	scumm->_enqueue_b = 0;
+ 	scumm->_enqueue_c = 0;
+ 	scumm->_enqueue_d = 0;
+ 	scumm->_enqueue_e = 0;
+ 
+ 	scumm->_palManipCounter = 0;
+ 	scumm->_palManipStart = 0;
+ 	scumm->_palManipEnd = 0;
+ 
  	memset(scumm->_colorCycle, 0, sizeof(scumm->_colorCycle));
  /* */