* Renamed several methods in favor of a somewhat more uniform naming scheme: setupFOO for stuff that inits static data (i.e. will be called only once, or after loading savegames), vs. resetFOO / updateFOO methods which are called frequently and (re)set dynamic data.

* Doing this, split scummInit into setupScumm and resetScumm methods
* Moved some init code to new methods (huuuuge init methods are hard to read, and hard to customize using subclassing)
* Renmaed various setup???Palette methods to set???Palette
* Some minor cleanup / tweaks

svn-id: r22227

2 files changed, 10 insertions, 10 deletions

diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index f06214e1fc..47cb1cd374 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -66,7 +66,7 @@ public:
 	ScummEngine_v60he(OSystem *syst, const DetectorResult &dr);
 	~ScummEngine_v60he();
 
-	virtual void scummInit();
+	virtual void resetScumm();
 
 protected:
 	virtual void setupOpcodes();
@@ -144,7 +144,7 @@ protected:
 	virtual const char *getOpcodeDesc(byte i);
 
 	virtual void setupScummVars();
-	virtual void initScummVars();
+	virtual void resetScummVars();
 
 	virtual void saveOrLoad(Serializer *s);
 
@@ -251,7 +251,7 @@ protected:
 public:
 	ScummEngine_v72he(OSystem *syst, const DetectorResult &dr);
 
-	virtual void scummInit();
+	virtual void resetScumm();
 
 protected:
 	virtual void setupOpcodes();
@@ -259,7 +259,7 @@ protected:
 	virtual const char *getOpcodeDesc(byte i);
 
 	virtual void setupScummVars();
-	virtual void initScummVars();
+	virtual void resetScummVars();
 	virtual void readArrayFromIndexFile();
 
 	virtual byte *getStringAddress(int i);
@@ -368,7 +368,7 @@ protected:
 	virtual const char *getOpcodeDesc(byte i);
 
 	virtual void setupScummVars();
-	virtual void initScummVars();
+	virtual void resetScummVars();
 
 	virtual void initCharset(int charset);
 
@@ -436,7 +436,7 @@ public:
 	ScummEngine_v90he(OSystem *syst, const DetectorResult &dr);
 	~ScummEngine_v90he();
 
-	virtual void scummInit();
+	virtual void resetScumm();
 
 	LogicHE *_logicHE;
 	Sprite *_sprite;
@@ -450,7 +450,7 @@ protected:
 	virtual void scummLoop_handleDrawing();
 
 	virtual void setupScummVars();
-	virtual void initScummVars();
+	virtual void resetScummVars();
 
 	virtual void saveOrLoad(Serializer *s);
 
@@ -534,10 +534,10 @@ class ScummEngine_v99he : public ScummEngine_v90he {
 public:
 	ScummEngine_v99he(OSystem *syst, const DetectorResult &dr) : ScummEngine_v90he(syst, dr) {}
 
-	virtual void scummInit();
+	virtual void resetScumm();
 
 protected:
-	virtual void initScummVars();
+	virtual void resetScummVars();
 
 	virtual void readMAXS(int blockSize);
 
diff --git a/engines/scumm/he/script_v60he.cpp b/engines/scumm/he/script_v60he.cpp
index 8c4324b6c7..d8fe03f702 100644
--- a/engines/scumm/he/script_v60he.cpp
+++ b/engines/scumm/he/script_v60he.cpp
@@ -548,7 +548,7 @@ void ScummEngine_v60he::o60_roomOps() {
 		b = pop();
 		a = pop();
 		if (_game.heversion == 60)
-			setupShadowPalette(a, b, c, d, e, 0, 256);
+			setShadowPalette(a, b, c, d, e, 0, 256);
 		break;
 
 	case 186:		// SO_ROOM_TRANSFORM