[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.45,1.46 init.cpp,1.7,1.8 scumm.h,1.113,1.114

[James Brown]

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

Modified Files:
	actor.cpp init.cpp scumm.h 
Log Message:
Remove unneeded init stuff



Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** actor.cpp	11 Apr 2002 14:13:53 -0000	1.45
--- actor.cpp	11 Apr 2002 14:22:45 -0000	1.46
***************
*** 26,45 ****
  
  void Scumm::initActor(Actor *a, int mode) {
- 	if (a->init != 1) {		/* Check if this is the first time we've   */
- 		a->costume = 0;		/* used this actor. If so, init everything */
- 		a->room = 0;
- 		a->x = a->y = 0;		
- 		a->facing = 0;
- 		a->newDirection = 0;
- 		a->visible = 0;
- 		a->mask = 0;
- 		a->walkbox = 0;
- 		a->animProgress = a->animSpeed = 0;
- 		a->layer = 0;
- 
- 		a->init = 1;
- 	}
- 
- 
  	if (mode==1) {
  		a->costume = 0;
--- 26,29 ----

Index: init.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/init.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** init.cpp	8 Apr 2002 03:34:42 -0000	1.7
--- init.cpp	11 Apr 2002 14:22:45 -0000	1.8
***************
*** 26,156 ****
  Scumm::Scumm(void)
  {	
! 	/* Initilize all our stuff */
! 	memset(&res, 0, sizeof(res));
! 	memset(&vm, 0, sizeof(vm));
! 	memset(&camera, 0, sizeof(camera));
! 	memset(&mouse, 0, sizeof(mouse));
! 	memset(&string, 0, sizeof(string));
! 	memset(&_mixer_channel, 0, sizeof(_mixer_channel));
! 	memset(&charset, 0, sizeof(charset));
! 	memset(&actor, 0, sizeof(actor));
! 	memset(&sentence, 0, sizeof(sentence));
! 	
! 	//memset(_objs, 0, sizeof(_objs));
! 	memset(_colorCycle, 0, sizeof(_colorCycle));        
! 	memset(_mouthSyncTimes, 0, sizeof(_mouthSyncTimes));        
! 
! 	/* Initialize the sound queues */
! 	clearSoundQue();
! 
! 		_resFilePath=0;
!         _resFilePrefix=0;
!         _scummStackPos=0;
!         _verbMouseOver=0;
! 
!         _palDirtyMax=0;
!         _palDirtyMin=0;
!         _debugger=0;
! 
!         _xPos = 0;
!         _yPos = 0;
!         _dir = 0;
! 
!         _resultVarNumber = 0;
!         delta=0;
!         _soundEngine=0;
!         _gui=0;
! 
!         _verbs=0;
!         _objs=0;
!         _debugger=0;
! 
!         _inventory=0;
!         _arrays=0;
!         _newNames=0;
!         _vars=0;
!         _varwatch=0;
!         _bitVars=0;
! 
!         _talk_sound_mode=0;
!         _talk_sound_a = 0;
!         _talk_sound_b = 0;
! 
!         _curActor = 0;
!         _curExecScript = 0;
!         _curPalIndex = 0;
!         _curVerb = 0;
!         _curVerbSlot = 0;
!         _currentScript = 0;
!         _currentRoom = 0;
! 
!         _midi_driver = 0;
!         _curSoundPos = 0;
!         _soundQuePos = 0;
!         _soundQue2Pos = 0;
!         _soundParam = 0;
!         _soundParam2 = 0;
!         _soundParam3 = 0;
! 		_soundsPaused = 0;
! 		_soundsPaused2 = 0;
!         current_cd_sound = 0;
!         num_sound_effects = 0;
!         _noSubtitles = 0;
! 
!         _screenEffectFlag = 0;
!         _switchRoomEffect = 0;
!         _switchRoomEffect2 = 0;
!         _screenLeft = 0;
!         _screenTop = 0;
! 
!         _enqueue_b = 0;
!         _enqueue_c = 0;
!         _enqueue_d = 0;
!         _enqueue_e = 0;
! 
!         _palManipCounter = 0;
!         _palManipStart = 0;
!         _palManipEnd = 0;
! 
!         
! 
!         _CLUT_offs = 0;
!         _ENCD_offs = 0;
!         _EPAL_offs = 0;
!         _IM00_offs = 0;
!         _PALS_offs = 0;
! 
!         _fastMode = 0;
! 
!         
!         _charsetColor = 0;
! 
!         _insaneFlag = 12;
!         _insaneState = 0;
! 
! 
! 		_haveMsg = 0;
! 		_talkDelay = 0;
! 		_defaultTalkDelay = 0;
! 		_useTalkAnims = 0;
! 		_endOfMouthSync = 0;
! 		_mouthSyncMode = 0;
! 
! 		_lastLoadedRoom = -1; /* This to be sure that the check in openRoom will fail */
! 		_roomResource = 0;
! 		_dynamicRoomOffsets = 0; /* This seems to be a reasonable default value :-) */
! 
! 		gdi._mask_left = -1; /* Taken from saveload.cpp */
! 		gdi._disable_zbuffer = false; /* By default, ZBuffer should be on */
! 		gdi._cursorActive = 0; /* Maybe false ? */
! 		_cursorAnimate = 0; /* Reasonable default too I hope */
! 		_cursorAnimateIndex = 0; /* Absolutely no idea what THAT should have as a default value */
! 		_sfxMode = 0; /* Still same comment :-) */
! 		_saveLoadFlag = 0;
! 		_completeScreenRedraw = false; /* Maybe it should be true to force a full redraw on start ? */
! 		_expire_counter = 0; /* Start expired (0xFF) or not ? */
! 		_leftBtnPressed = 0;
! 		_rightBtnPressed = 0;
! 		_lastKeyHit = 0;
! 		_cdrom = 0;
  }
--- 26,29 ----
  Scumm::Scumm(void)
  {	
! 	/* No need to put anything here yet :) */	
  }

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** scumm.h	10 Apr 2002 18:20:32 -0000	1.113
--- scumm.h	11 Apr 2002 14:22:45 -0000	1.114
***************
*** 428,432 ****
  
  struct Actor {
- 	int init;
  	int x,y,top,bottom;
  	int elevation;
--- 428,431 ----