Remove unneeded init stuff

svn-id: r3905

3 files changed, 1 insertions, 145 deletions

diff --git a/actor.cpp b/actor.cpp
index 25e4296816..1cc13c08dd 100644
--- a/actor.cpp
+++ b/actor.cpp
@@ -25,22 +25,6 @@
 #include "math.h"
 
 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;
 		a->room = 0;
diff --git a/init.cpp b/init.cpp
index 67f6515bf6..f103d62ad5 100644
--- a/init.cpp
+++ b/init.cpp
@@ -25,132 +25,5 @@
 
 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;
+	/* No need to put anything here yet :) */	
 }
diff --git a/scumm.h b/scumm.h
index 6a40a4655e..e783369e0c 100644
--- a/scumm.h
+++ b/scumm.h
@@ -427,7 +427,6 @@ struct CostumeRenderer {
 };
 
 struct Actor {
-	int init;
 	int x,y,top,bottom;
 	int elevation;
 	uint width;