[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.56,1.57 sdl.cpp,1.53,1.54

[James Brown]

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

Modified Files:
	gfx.cpp sdl.cpp 
Log Message:
Add a few more uninited variables. Not done yet.



Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** gfx.cpp	24 Mar 2002 00:27:00 -0000	1.56
--- gfx.cpp	24 Mar 2002 16:35:17 -0000	1.57
***************
*** 456,459 ****
--- 456,462 ----
  		valueToAdd = _vars[VAR_TIMER_NEXT];
  
+ 	if (!_colorCycle)	// FIXME
+ 		return;
+ 
  	for (i=0,cycl=_colorCycle; i<16; i++,cycl++) {
  		if (cycl->delay &&
***************
*** 500,504 ****
  
  	num = end - start;
! 	
  	if (!direction) {
  		memmove(tmp, endptr, 6);
--- 503,512 ----
  
  	num = end - start;
! 
! 	if (!endptr) {
! 		warning("moveMemInPalRes(%d,%d): Bad end pointer\n", start, end);
! 		return;
! 	}
! 
  	if (!direction) {
  		memmove(tmp, endptr, 6);

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** sdl.cpp	24 Mar 2002 14:35:06 -0000	1.53
--- sdl.cpp	24 Mar 2002 16:35:17 -0000	1.54
***************
*** 918,923 ****
  	
  #endif
! 
! 	long i;
  
  	detecter.detectMain(argc, argv);
--- 918,925 ----
  	
  #endif
! 
! 
! 	long i;
! 
  
  	detecter.detectMain(argc, argv);
***************
*** 927,1021 ****
  	else
  	if( detecter._features & GF_OLD256 )
! 		scumm = new Scumm_v3;
  	else
  		scumm = new Scumm;
! 
! /* All those stuff should be moved to the constructor.... */
! 
! 	for (i=0;i<17;i++)
! 	{
! 		scumm->res.address[i]=0;
! 		scumm->res.flags[i]=0;
! 		scumm->res.mode[i]=0;
! 		scumm->res.name[i]=0;
! 		scumm->res.num[i]=0;
! 		scumm->res.roomno[i]=0;
! 		scumm->res.roomoffs[i]=0;
! 		scumm->res.tags[i]=0;
! 	}
! 
! 	scumm->_resFilePath=0;
! 	scumm->_resFilePrefix=0;
! 
! 	for (i=1; i<NUM_SCRIPT_SLOT; i++)
! 	{
! 		scumm->vm.slot[i].status=0;
! 		scumm->vm.slot[i].cutsceneOverride=0;
! 		scumm->vm.slot[i].delay=0;
! 		scumm->vm.slot[i].didexec=0;
! 		scumm->vm.slot[i].freezeCount=0;
! 		scumm->vm.slot[i].newfield=0;
! 		scumm->vm.slot[i].number=0;
! 		scumm->vm.slot[i].offs=0;
! 		scumm->vm.slot[i].unk1=0;
! 		scumm->vm.slot[i].unk2=0;
! 		scumm->vm.slot[i].unk5=0;
! 		scumm->vm.slot[i].where=0;
! 	}
! 
! 	for (i=0; i<5;i++)
! 	{
! 		scumm->vm.cutScenePtr[i]=0;
! 		scumm->vm.cutSceneScript[i]=0;
! 		scumm->vm.cutSceneData[i]=0;
! 	}
! 
! 	scumm->vm.cutSceneScriptIndex=0;
! 	scumm->vm.cutSceneStackPointer=0;
! 
! 	scumm->_scummStackPos=0;
! 	scumm->_verbMouseOver=0;
! 
! 	scumm->_palDirtyMax=0;
! 	scumm->_palDirtyMin=0;
! 
! 	scumm->_debugger=0;
! 	scumm->camera._cur.x=0;
! 	scumm->camera._cur.y=0;
! 	scumm->camera._dest.x=0;
! 	scumm->camera._dest.y=0;
! 	scumm->camera._accel.x=0;
! 	scumm->camera._accel.y=0;
! 	scumm->camera._last.x=0;
! 	scumm->camera._last.y=0;
! 	scumm->camera._leftTrigger=0;
! 	scumm->camera._rightTrigger=0;
! 	scumm->camera._follows=0;
! 	scumm->camera._mode=0;
! 	scumm->camera._movingToActor=0;
! 
! 	scumm->mouse.x=0;
! 	scumm->mouse.y=0;
! 
! 	scumm->delta=0;
! 
! 	scumm->_soundEngine=0;
! 	scumm->_gui=0;
! 
! 	scumm->_verbs=0;
! 	scumm->_objs=0;
! 	scumm->_debugger=0;
! 
! 	scumm->_inventory=0;
! 	scumm->_arrays=0;
! 	scumm->_newNames=0;
! 	scumm->_vars=0;
! 	scumm->_varwatch=0;
! 	scumm->_bitVars=0;
! 
! 	scumm->_talk_sound_mode=0;
! 
! /* */
! 
  
  	scumm->_fullScreen = detecter._fullScreen;
--- 929,1037 ----
  	else
  	if( detecter._features & GF_OLD256 )
! 		scumm = new Scumm_v3;
! 
  	else
  		scumm = new Scumm;
! 
! 
! /* All those stuff should be moved to the constructor.... */
! 	for (i=0;i<17;i++)
! 	{
! 		scumm->res.address[i]=0;
! 		scumm->res.flags[i]=0;
! 		scumm->res.mode[i]=0;
! 		scumm->res.name[i]=0;
! 		scumm->res.num[i]=0;
! 		scumm->res.roomno[i]=0;
! 		scumm->res.roomoffs[i]=0;
! 		scumm->res.tags[i]=0;
! 	}
! 
! 	scumm->_resFilePath=0;
! 	scumm->_resFilePrefix=0;
! 
! 	for (i=1; i<NUM_SCRIPT_SLOT; i++)
! 	{
! 		scumm->vm.slot[i].status=0;
! 		scumm->vm.slot[i].cutsceneOverride=0;
! 		scumm->vm.slot[i].delay=0;
! 		scumm->vm.slot[i].didexec=0;
! 		scumm->vm.slot[i].freezeCount=0;
! 		scumm->vm.slot[i].newfield=0;
! 		scumm->vm.slot[i].number=0;
! 		scumm->vm.slot[i].offs=0;
! 		scumm->vm.slot[i].unk1=0;
! 		scumm->vm.slot[i].unk2=0;
! 		scumm->vm.slot[i].unk5=0;
! 		scumm->vm.slot[i].where=0;
! 	}
! 
! 	for (i=0; i<5;i++)
! 	{
! 		scumm->vm.cutScenePtr[i]=0;
! 		scumm->vm.cutSceneScript[i]=0;
! 		scumm->vm.cutSceneData[i]=0;
! 	}
! 
! 	scumm->vm.cutSceneScriptIndex=0;
! 	scumm->vm.cutSceneStackPointer=0;
! 	
! 	scumm->_scummStackPos=0;
! 	scumm->_verbMouseOver=0;
! 
! 	scumm->_palDirtyMax=0;
! 	scumm->_palDirtyMin=0;
! 	scumm->_debugger=0;
! 	scumm->camera._cur.x=0;
! 	scumm->camera._cur.y=0;
! 	scumm->camera._dest.x=0;
! 	scumm->camera._dest.y=0;
! 	scumm->camera._accel.x=0;
! 	scumm->camera._accel.y=0;
! 	scumm->camera._last.x=0;
! 	scumm->camera._last.y=0;
! 	scumm->camera._leftTrigger=0;
! 	scumm->camera._rightTrigger=0;
! 	scumm->camera._follows=0;
! 	scumm->camera._mode=0;
! 	scumm->camera._movingToActor=0;
! 
! 	scumm->mouse.x=0;
! 	scumm->mouse.y=0;
! 
! 	scumm->delta=0;
! 	scumm->_soundEngine=0;
! 	scumm->_gui=0;
! 
! 	scumm->_verbs=0;
! 	scumm->_objs=0;
! 	scumm->_debugger=0;
! 
! 	scumm->_inventory=0;
! 	scumm->_arrays=0;
! 	scumm->_newNames=0;
! 	scumm->_vars=0;
! 	scumm->_varwatch=0;
! 	scumm->_bitVars=0;
! 
! 	scumm->_talk_sound_mode=0;
! 
! 	scumm->_curActor = 0;
! 	scumm->_curExecScript = 0;
! 	scumm->_curPalIndex = 0;
! 	scumm->_curVerb = 0;
! 	scumm->_curVerbSlot = 0;
! 	scumm->_currentScript = 0;
! 	scumm->_currentRoom = 0;
! 
! 	scumm->_soundQuePos = 0;	
! 	scumm->_soundQue2Pos = 0;
! 
! 	scumm->_screenEffectFlag = 0;
! 	memset(scumm->_colorCycle, 0, sizeof(scumm->_colorCycle));
! /* */
! 
! 
! 
  
  	scumm->_fullScreen = detecter._fullScreen;