Merge remote branch 'upstream/master' into t7g-ios

Conflicts:
	engines/groovie/script.cpp

92 files changed, 101 insertions, 393 deletions

diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp
index 9ec253e512..4e9847f8b4 100644
--- a/engines/tinsel/actors.cpp
+++ b/engines/tinsel/actors.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Handles things to do with actors, delegates much moving actor stuff.
  */
 
@@ -437,7 +434,7 @@ void StartTaggedActors(SCNHANDLE ah, int numActors, bool bRunScript) {
 		memset(taggedActors, 0, sizeof(taggedActors));
 		numTaggedActors = numActors;
 	} else {
-		// Only actors with code blocks got (x, y) re-initialised, so...
+		// Only actors with code blocks got (x, y) re-initialized, so...
 		for (i = 0; i < NumActors; i++) {
 			actorInfo[i].x = actorInfo[i].y = 0;
 			actorInfo[i].mtype = 0;
diff --git a/engines/tinsel/actors.h b/engines/tinsel/actors.h
index 2be42b00e6..e707db77ba 100644
--- a/engines/tinsel/actors.h
+++ b/engines/tinsel/actors.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Prototypes of actor functions
  */
 
diff --git a/engines/tinsel/adpcm.cpp b/engines/tinsel/adpcm.cpp
index 530395d754..4ea835586b 100644
--- a/engines/tinsel/adpcm.cpp
+++ b/engines/tinsel/adpcm.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/stream.h"
diff --git a/engines/tinsel/adpcm.h b/engines/tinsel/adpcm.h
index 79d537eef6..3e899d94c3 100644
--- a/engines/tinsel/adpcm.h
+++ b/engines/tinsel/adpcm.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_ADPCM_H
diff --git a/engines/tinsel/anim.cpp b/engines/tinsel/anim.cpp
index 61c8b67624..034296ccc7 100644
--- a/engines/tinsel/anim.cpp
+++ b/engines/tinsel/anim.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains utilities to handle object animation.
  */
 
diff --git a/engines/tinsel/anim.h b/engines/tinsel/anim.h
index 97065f6a54..0c60cf84d4 100644
--- a/engines/tinsel/anim.h
+++ b/engines/tinsel/anim.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Object animation definitions
  */
 
diff --git a/engines/tinsel/background.cpp b/engines/tinsel/background.cpp
index 79f051420b..72397db97f 100644
--- a/engines/tinsel/background.cpp
+++ b/engines/tinsel/background.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Background handling code.
  */
 
@@ -40,7 +37,7 @@ namespace Tinsel {
 const BACKGND *pCurBgnd = NULL;
 
 /**
- * Called to initialise a background.
+ * Called to initialize a background.
  * @param pBgnd			Pointer to data struct for current background
  */
 
@@ -152,7 +149,7 @@ int PlayfieldGetCenterX(int which) {
  * @param which			Which playfield
  */
 
-OBJECT *GetPlayfieldList(int which) {
+OBJECT **GetPlayfieldList(int which) {
 	PLAYFIELD *pPlayfield;	// pointer to relavent playfield
 
 	// make sure there is a background
@@ -165,7 +162,7 @@ OBJECT *GetPlayfieldList(int which) {
 	pPlayfield = pCurBgnd->fieldArray + which;
 
 	// return the display list pointer for this playfield
-	return pPlayfield->pDispList;
+	return &pPlayfield->pDispList;
 }
 
 /**
@@ -205,10 +202,10 @@ void DrawBackgnd() {
 			pPlay->bMoved = true;
 
 		// sort the display list for this background - just in case somebody has changed object Z positions
-		SortObjectList(pPlay->pDispList);
+		SortObjectList(&pPlay->pDispList);
 
 		// generate clipping rects for all objects that have moved etc.
-		FindMovingObjects(pPlay->pDispList, &ptWin,
+		FindMovingObjects(&pPlay->pDispList, &ptWin,
 			&pPlay->rcClip,	false, pPlay->bMoved);
 
 		// clear playfield moved flag
@@ -235,8 +232,7 @@ void DrawBackgnd() {
 
 			if (IntersectRectangle(rcPlayClip, pPlay->rcClip, *r))
 				// redraw all objects within this clipping rect
-				UpdateClipRect(pPlay->pDispList,
-						&ptWin,	&rcPlayClip);
+				UpdateClipRect(&pPlay->pDispList, &ptWin,	&rcPlayClip);
 		}
 	}
 
diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h
index 06789e50bf..34f1bd6dd2 100644
--- a/engines/tinsel/background.h
+++ b/engines/tinsel/background.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Data structures used for handling backgrounds
  */
 
@@ -76,7 +73,7 @@ struct BACKGND {
 |*			Background Function Prototypes			*|
 \*----------------------------------------------------------------------*/
 
-void InitBackground(		// called to initialise a background
+void InitBackground(		// called to initialize a background
 	const BACKGND *pBgnd);	// pointer to data struct for current background
 
 void StartupBackground(CORO_PARAM, SCNHANDLE hFilm);
@@ -96,7 +93,7 @@ void PlayfieldGetPos(		// Returns the xy position of the specified playfield in
 int PlayfieldGetCenterX(	// Returns the xy position of the specified playfield in the current background
 	int which);		// which playfield
 
-OBJECT *GetPlayfieldList(	// Returns the display list for the specified playfield
+OBJECT **GetPlayfieldList(	// Returns the display list for the specified playfield
 	int which);		// which playfield
 
 void KillPlayfieldList(		// Kills all the objects on the display list for the specified playfield
diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp
index 0e67c3a06e..cf692e16ea 100644
--- a/engines/tinsel/bg.cpp
+++ b/engines/tinsel/bg.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Plays the background film of a scene.
  */
 
@@ -129,7 +126,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
 			// Get the MULTI_INIT structure
 			pmi = (const MULTI_INIT *)LockMem(FROM_LE_32(pReel->mobj));
 
-			// Initialise and insert the object, and initialise its script.
+			// Initialize and insert the object, and initialize its script.
 			pBG[0] = MultiInitObject(pmi);
 			MultiInsertObject(GetPlayfieldList(FIELD_WORLD), pBG[0]);
 			InitStepAnimScript(&thisAnim[0], pBG[0], FROM_LE_32(pReel->script), BGspeed);
@@ -144,7 +141,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
 				// Get the MULTI_INIT structure
 				pmi = (PMULTI_INIT) LockMem(FROM_LE_32(pFilm->reels[i].mobj));
 
-				// Initialise and insert the object, and initialise its script.
+				// Initialize and insert the object, and initialize its script.
 				pBG[i] = MultiInitObject(pmi);
 				MultiInsertObject(GetPlayfieldList(FIELD_WORLD), pBG[i]);
 				MultiSetZPosition(pBG[i], 0);
@@ -179,7 +176,7 @@ static void BGmainProcess(CORO_PARAM, const void *param) {
 			pFilm = (const FILM *)LockMem(hBackground);
 			assert(bgReels == (int32)FROM_LE_32(pFilm->numreels));
 
-			// Just re-initialise the scripts.
+			// Just re-initialize the scripts.
 			for (int i = 0; i < bgReels; i++) {
 				InitStepAnimScript(&thisAnim[i], pBG[i], pFilm->reels[i].script, BGspeed);
 				StepAnimScript(&thisAnim[i]);
@@ -205,7 +202,7 @@ static void BGotherProcess(CORO_PARAM, const void *param) {
 
 	CORO_BEGIN_CODE(_ctx);
 
-	// Initialise and insert the object, and initialise its script.
+	// Initialize and insert the object, and initialize its script.
 	_ctx->pObj = MultiInitObject(pmi);
 	MultiInsertObject(GetPlayfieldList(FIELD_WORLD), _ctx->pObj);
 
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 793febdc21..24d47b920f 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * The movie player.
  */
 
@@ -388,7 +385,7 @@ void BMVPlayer::MoviePalette(int paletteOffset) {
 		SetTextPal(talkColor);
 }
 
-void BMVPlayer::InitialiseMovieSound() {
+void BMVPlayer::InitializeMovieSound() {
 	_audioStream = Audio::makeQueuingAudioStream(22050, true);
 	audioStarted = false;
 }
@@ -666,7 +663,7 @@ void BMVPlayer::LoadSlots(int number) {
 /**
  * Called from the foreground when starting playback of a movie.
  */
-void BMVPlayer::InitialiseBMV() {
+void BMVPlayer::InitializeBMV() {
 	if (!stream.open(szMovieFile))
 		error(CANNOT_FIND_FILE, szMovieFile);
 
@@ -683,7 +680,7 @@ void BMVPlayer::InitialiseBMV() {
 	// Pass the sceen buffer to the decompresser
 	InitBMV(screenBuffer);
 
-	// Initialise some stuff
+	// Initialize some stuff
 	nextUseOffset = 0;
 	nextSoundOffset = 0;
 	wrapUseOffset = -1;
@@ -708,8 +705,8 @@ void BMVPlayer::InitialiseBMV() {
 	while (numAdvancePackets < ADVANCE_SOUND)
 		LoadSlots(1);
 
-	// Initialise the sound channel
-	InitialiseMovieSound();
+	// Initialize the sound channel
+	InitializeMovieSound();
 }
 
 /**
@@ -1069,7 +1066,7 @@ void BMVPlayer::FettleBMV() {
 
 		// First time in with this movie
 
-		InitialiseBMV();
+		InitializeBMV();
 
 		for (i = 0; i < ADVANCE_SOUND;) {
 			if (DoSoundFrame())
diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h
index d90d68fc13..eadf65c3aa 100644
--- a/engines/tinsel/bmv.h
+++ b/engines/tinsel/bmv.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Plays films within a scene, takes into account the actor in each 'column'.
  */
 
@@ -137,7 +134,7 @@ private:
 	void InitBMV(byte *memoryBuffer);
 	void PrepAudio(const byte *sourceData, int blobCount, byte *destPtr);
 	void MoviePalette(int paletteOffset);
-	void InitialiseMovieSound();
+	void InitializeMovieSound();
 	void StartMovieSound();
 	void FinishMovieSound();
 	void MovieAudio(int audioOffset, int blobs);
@@ -147,7 +144,7 @@ private:
 	int MovieCommand(char cmd, int commandOffset);
 	int FollowingPacket(int thisPacket, bool bReallyImportant);
 	void LoadSlots(int number);
-	void InitialiseBMV();
+	void InitializeBMV();
 	bool MaintainBuffer();
 	bool DoBMVFrame();
 	bool DoSoundFrame();
diff --git a/engines/tinsel/cliprect.cpp b/engines/tinsel/cliprect.cpp
index 5f287d3eab..76feede83f 100644
--- a/engines/tinsel/cliprect.cpp
+++ b/engines/tinsel/cliprect.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains the clipping rectangle code.
  */
 
@@ -108,10 +105,10 @@ static bool LooseIntersectRectangle(const Common::Rect &pSrc1, const Common::Rec
  * @param bNoVelocity		When reset, objects pos is updated with velocity
  * @param bScrolled)		When set, playfield has scrolled
  */
-void FindMovingObjects(OBJECT *pObjList, Common::Point *pWin, Common::Rect *pClip, bool bNoVelocity, bool bScrolled) {
+void FindMovingObjects(OBJECT **pObjList, Common::Point *pWin, Common::Rect *pClip, bool bNoVelocity, bool bScrolled) {
 	OBJECT *pObj;			// object list traversal pointer
 
-	for (pObj = pObjList->pNext; pObj != NULL; pObj = pObj->pNext) {
+	for (pObj = *pObjList; pObj != NULL; pObj = pObj->pNext) {
 		if (!bNoVelocity) {
 			// we want to add velocities to objects position
 
@@ -206,16 +203,16 @@ void MergeClipRect() {
  * @param pWin			Window top left position
  * @param pClip			Pointer to clip rectangle
  */
-void UpdateClipRect(OBJECT *pObjList, Common::Point *pWin, Common::Rect *pClip) {
+void UpdateClipRect(OBJECT **pObjList, Common::Point *pWin, Common::Rect *pClip) {
 	int x, y, right, bottom;	// object corners
 	int hclip, vclip;			// total size of object clipping
 	DRAWOBJECT currentObj;		// filled in to draw the current object in list
 	OBJECT *pObj;				// object list iterator
 
-	// Initialise the fields of the drawing object to empty
+	// Initialize the fields of the drawing object to empty
 	memset(&currentObj, 0, sizeof(DRAWOBJECT));
 
-	for (pObj = pObjList->pNext; pObj != NULL; pObj = pObj->pNext) {
+	for (pObj = *pObjList; pObj != NULL; pObj = pObj->pNext) {
 		if (pObj->flags & DMA_ABS) {
 			// object position is absolute
 			x = fracToInt(pObj->xPos);
diff --git a/engines/tinsel/cliprect.h b/engines/tinsel/cliprect.h
index 7bbb6bdc25..101289b837 100644
--- a/engines/tinsel/cliprect.h
+++ b/engines/tinsel/cliprect.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Clipping rectangle defines
  */
 
@@ -58,7 +55,7 @@ bool UnionRectangle(		// Creates the union of two rectangles
 	const Common::Rect &pSrc2);		// a source rectangle
 
 void FindMovingObjects(		// Creates clipping rectangles for all the objects that have moved on the specified object list
-	OBJECT *pObjList,	// playfield display list to draw
+	OBJECT **pObjList,	// playfield display list to draw
 	Common::Point *pWin,		// playfield window top left position
 	Common::Rect *pClip,		// playfield clipping rectangle
 	bool bVelocity,		// when set, objects pos is updated with velocity
@@ -67,7 +64,7 @@ void FindMovingObjects(		// Creates clipping rectangles for all the objects that
 void MergeClipRect();	// Merges any clipping rectangles that overlap
 
 void UpdateClipRect(		// Redraws all objects within this clipping rectangle
-	OBJECT *pObjList,	// object list to draw
+	OBJECT **pObjList,	// object list to draw
 	Common::Point *pWin,		// window top left position
 	Common::Rect *pClip);		// pointer to clip rectangle
 
diff --git a/engines/tinsel/config.cpp b/engines/tinsel/config.cpp
index a206ebf03b..fd278db972 100644
--- a/engines/tinsel/config.cpp
+++ b/engines/tinsel/config.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains configuration functionality
  */
 
diff --git a/engines/tinsel/config.h b/engines/tinsel/config.h
index dcfaf47b0c..8b6b675766 100644
--- a/engines/tinsel/config.h
+++ b/engines/tinsel/config.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_CONFIG_H
diff --git a/engines/tinsel/coroutine.cpp b/engines/tinsel/coroutine.cpp
index b568cb4a46..998d98b52a 100644
--- a/engines/tinsel/coroutine.cpp
+++ b/engines/tinsel/coroutine.cpp
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #include "tinsel/coroutine.h"
diff --git a/engines/tinsel/coroutine.h b/engines/tinsel/coroutine.h
index b14030c708..b62c40b4e5 100644
--- a/engines/tinsel/coroutine.h
+++ b/engines/tinsel/coroutine.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_COROUTINE_H
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp
index 66dc47df1f..8248609a81 100644
--- a/engines/tinsel/cursor.cpp
+++ b/engines/tinsel/cursor.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Cursor and cursor trails.
  */
 
@@ -80,7 +77,7 @@ static int nextTrail = 0;
 
 static bool bWhoa = false;		// Set by DropCursor() at the end of a scene
 				// - causes cursor processes to do nothing
-				// Reset when main cursor has re-initialised
+				// Reset when main cursor has re-initialized
 
 static uint16 restart = 0;	// When main cursor has been bWhoa-ed, it waits
 							// for this to be set to 0x8000.
@@ -109,8 +106,8 @@ static int lastCursorX = 0, lastCursorY = 0;
 static void DoCursorMove();
 
 /**
- * Initialise and insert a cursor trail object, set its Z-pos, and hide
- * it. Also initialise its animation script.
+ * Initialize and insert a cursor trail object, set its Z-pos, and hide
+ * it. Also initialize its animation script.
  */
 static void InitCurTrailObj(int i, int x, int y) {
 	const FREEL *pfr;		// pointer to reel
@@ -130,13 +127,13 @@ static void InitCurTrailObj(int i, int x, int y) {
 	assert(BgPal()); // No background palette
 	pim->hImgPal = TO_LE_32(BgPal());
 
-	// Initialise and insert the object, set its Z-pos, and hide it
+	// Initialize and insert the object, set its Z-pos, and hide it
 	ntrailData[i].trailObj = MultiInitObject(pmi);
 	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), ntrailData[i].trailObj);
 	MultiSetZPosition(ntrailData[i].trailObj, Z_CURSORTRAIL);
 	MultiSetAniXY(ntrailData[i].trailObj, x, y);
 
-	// Initialise the animation script
+	// Initialize the animation script
 	InitStepAnimScript(&ntrailData[i].trailAnim, ntrailData[i].trailObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
 	StepAnimScript(&ntrailData[i].trailAnim);
 }
@@ -230,7 +227,7 @@ void GetCursorXY(int *x, int *y, bool absolute) {
 }
 
 /**
- * Re-initialise the main cursor to use the main cursor reel.
+ * Re-initialize the main cursor to use the main cursor reel.
  * Called from TINLIB.C to restore cursor after hiding it.
  * Called from INVENTRY.C to restore cursor after customising it.
  */
@@ -388,11 +385,11 @@ void SetAuxCursor(SCNHANDLE hFilm) {
 	ACoY = (short)((FROM_LE_16(pim->imgHeight) & ~C16_FLAG_MASK)/2 -
 		((int16) FROM_LE_16(pim->anioffY)));
 
-	// Initialise and insert the auxillary cursor object
+	// Initialize and insert the auxillary cursor object
 	AcurObj = MultiInitObject(pmi);
 	MultiInsertObject(GetPlayfieldList(FIELD_STATUS), AcurObj);
 
-	// Initialise the animation and set its position
+	// Initialize the animation and set its position
 	InitStepAnimScript(&AcurAnim, AcurObj, FROM_LE_32(pfr->script), ONE_SECOND / FROM_LE_32(pfilm->frate));
 	MultiSetAniXY(AcurObj, x - ACoX, y - ACoY);
 	MultiSetZPosition(AcurObj, Z_ACURSOR);
@@ -473,7 +470,7 @@ static void DoCursorMove() {
 }
 
 /**
- * Initialise cursor object.
+ * Initialize cursor object.
  */
 static void InitCurObj() {
 	const FILM *pFilm;
@@ -503,7 +500,7 @@ static void InitCurObj() {
 }
 
 /**
- * Initialise the cursor position.
+ * Initialize the cursor position.
  */
 static void InitCurPos() {
 	Common::Point ptMouse = _vm->getMousePosition();
@@ -533,7 +530,7 @@ static void CursorStoppedCheck(CORO_PARAM) {
 		while (restart != 0x8000)
 			CORO_SLEEP(1);
 
-		// Re-initialise
+		// Re-initialize
 		InitCurObj();
 		InitCurPos();
 		InventoryIconCursor(false);	// May be holding something
@@ -659,7 +656,7 @@ void DropCursor() {
  * RestartCursor is called when a new scene is starting up.
  */
 void RestartCursor() {
-	restart = 0x8000;	// Get the main cursor to re-initialise
+	restart = 0x8000;	// Get the main cursor to re-initialize
 }
 
 /**
diff --git a/engines/tinsel/cursor.h b/engines/tinsel/cursor.h
index 71e846297c..4e32aa3a19 100644
--- a/engines/tinsel/cursor.h
+++ b/engines/tinsel/cursor.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Clipping rectangle defines
  */
 
diff --git a/engines/tinsel/debugger.cpp b/engines/tinsel/debugger.cpp
index ed877587c7..1261326032 100644
--- a/engines/tinsel/debugger.cpp
+++ b/engines/tinsel/debugger.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "tinsel/tinsel.h"
diff --git a/engines/tinsel/debugger.h b/engines/tinsel/debugger.h
index e803f16566..ff4ccd519f 100644
--- a/engines/tinsel/debugger.h
+++ b/engines/tinsel/debugger.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_DEBUGGER_H
diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp
index 70bf398baf..27b16c5b93 100644
--- a/engines/tinsel/detection.cpp
+++ b/engines/tinsel/detection.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "base/plugins.h"
@@ -107,7 +104,7 @@ public:
 	TinselMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
-		return "Tinsel Engine";
+		return "Tinsel";
 	}
 
 	virtual const char *getOriginalCopyright() const {
diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index 6894cd0c47..c86db9e438 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 namespace Tinsel {
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 281dd2da55..6ca070b67a 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Handles the inventory and conversation windows.
  *
  * And the save/load game windows. Some of this will be platform
@@ -1322,7 +1319,7 @@ extern int WhichItemHeld() {
 }
 
 /**
- * Called from the cursor module when it re-initialises (at the start of
+ * Called from the cursor module when it re-initializes (at the start of
  * a new scene). For if we are holding something at scene-change time.
  */
 extern void InventoryIconCursor(bool bNewItem) {
diff --git a/engines/tinsel/dialogs.h b/engines/tinsel/dialogs.h
index f81a59a0b7..8c48eb8b76 100644
--- a/engines/tinsel/dialogs.h
+++ b/engines/tinsel/dialogs.h
@@ -19,9 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Inventory related functions
  */
 
diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp
index d252e45cf5..5977d3b718 100644
--- a/engines/tinsel/drives.cpp
+++ b/engines/tinsel/drives.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * CD/drive handling functions
  */
 
diff --git a/engines/tinsel/drives.h b/engines/tinsel/drives.h
index 709c0d2392..907071d2f8 100644
--- a/engines/tinsel/drives.h
+++ b/engines/tinsel/drives.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * CD/drive handling functions
  */
 
diff --git a/engines/tinsel/dw.h b/engines/tinsel/dw.h
index aed4c50408..21f6db946e 100644
--- a/engines/tinsel/dw.h
+++ b/engines/tinsel/dw.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_DW_H
diff --git a/engines/tinsel/effect.cpp b/engines/tinsel/effect.cpp
index 95785e5840..22027b0f02 100644
--- a/engines/tinsel/effect.cpp
+++ b/engines/tinsel/effect.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // Handles effect polygons.
diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp
index 4e61a6ef29..e701ddca99 100644
--- a/engines/tinsel/events.cpp
+++ b/engines/tinsel/events.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Main purpose is to process user events.
  * Also provides a couple of utility functions.
  */
diff --git a/engines/tinsel/events.h b/engines/tinsel/events.h
index a491f1e036..f2b4d7f663 100644
--- a/engines/tinsel/events.h
+++ b/engines/tinsel/events.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * User events processing and utility functions
  */
 
diff --git a/engines/tinsel/faders.cpp b/engines/tinsel/faders.cpp
index 99a8b9ff14..86d117af81 100644
--- a/engines/tinsel/faders.cpp
+++ b/engines/tinsel/faders.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Palette Fader and Flasher processes.
  */
 
diff --git a/engines/tinsel/faders.h b/engines/tinsel/faders.h
index b30a26d893..dc0b903d7e 100644
--- a/engines/tinsel/faders.h
+++ b/engines/tinsel/faders.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Data structures used by the fader and flasher processes
  */
 
diff --git a/engines/tinsel/film.h b/engines/tinsel/film.h
index 231fbf28db..edb8dc268d 100644
--- a/engines/tinsel/film.h
+++ b/engines/tinsel/film.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_FILM_H	// prevent multiple includes
diff --git a/engines/tinsel/font.cpp b/engines/tinsel/font.cpp
index f57a6d5d54..e857dca509 100644
--- a/engines/tinsel/font.cpp
+++ b/engines/tinsel/font.cpp
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #include "tinsel/actors.h"
diff --git a/engines/tinsel/font.h b/engines/tinsel/font.h
index e5f5ece201..83bc12354e 100644
--- a/engines/tinsel/font.h
+++ b/engines/tinsel/font.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_FONT_H	// prevent multiple includes
diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp
index bdcd3207f9..6a5d626de8 100644
--- a/engines/tinsel/graphics.cpp
+++ b/engines/tinsel/graphics.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Low level graphics interface.
  */
 
diff --git a/engines/tinsel/graphics.h b/engines/tinsel/graphics.h
index de16082441..d34f069f6a 100644
--- a/engines/tinsel/graphics.h
+++ b/engines/tinsel/graphics.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Low level graphics interface.
  */
 
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index 6f5f92c969..eeb83b1f98 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains the handle based Memory Manager code
  */
 
@@ -246,9 +243,6 @@ void LoadCDGraphData(MEMHANDLE *pH) {
  * @param next			Handle of end of range + 1
  */
 void LoadExtraGraphData(SCNHANDLE start, SCNHANDLE next) {
-	if (start == cdBaseHandle)
-		return;
-
 	OpenCDGraphFile();
 
 	MemoryDiscard((handleTable + cdPlayHandle)->_node); // Free it
diff --git a/engines/tinsel/handle.h b/engines/tinsel/handle.h
index c3c303a1e9..e681bfc131 100644
--- a/engines/tinsel/handle.h
+++ b/engines/tinsel/handle.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Graphics Memory Manager data structures
  */
 
diff --git a/engines/tinsel/heapmem.cpp b/engines/tinsel/heapmem.cpp
index e8c4ed23ee..026dc9457e 100644
--- a/engines/tinsel/heapmem.cpp
+++ b/engines/tinsel/heapmem.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains the handle based Memory Manager code.
  */
 
@@ -103,7 +100,7 @@ static void MemoryStats() {
 #endif
 
 /**
- * Initialises the memory manager.
+ * Initializes the memory manager.
  */
 void MemoryInit() {
 	// place first node on free list
@@ -136,7 +133,7 @@ void MemoryInit() {
 }
 
 /**
- * Deinitialises the memory manager.
+ * Deinitializes the memory manager.
  */
 void MemoryDeinit() {
 	const MEM_NODE *pHeap = &heapSentinel;
diff --git a/engines/tinsel/heapmem.h b/engines/tinsel/heapmem.h
index 95cc0285f2..7b29a3ecce 100644
--- a/engines/tinsel/heapmem.h
+++ b/engines/tinsel/heapmem.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains the handle based Memory Manager defines
  */
 
@@ -38,8 +35,8 @@ struct MEM_NODE;
 |*			Memory Function Prototypes			*|
 \*----------------------------------------------------------------------*/
 
-void MemoryInit();			// initialises the memory manager
-void MemoryDeinit();		// deinitialises the memory manager
+void MemoryInit();			// initializes the memory manager
+void MemoryDeinit();		// deinitializes the memory manager
 
 // reserves a memory node for a movable & discardable block
 MEM_NODE *MemoryNoAlloc();
diff --git a/engines/tinsel/mareels.cpp b/engines/tinsel/mareels.cpp
index 5d9672972a..bd267a2c65 100644
--- a/engines/tinsel/mareels.cpp
+++ b/engines/tinsel/mareels.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Functions to set up moving actors' reels.
  */
 
diff --git a/engines/tinsel/mareels.h b/engines/tinsel/mareels.h
index c31ceafbf4..2ff5ca906e 100644
--- a/engines/tinsel/mareels.h
+++ b/engines/tinsel/mareels.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_MAREELS_H	// prevent multiple includes
diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp
index 5fc555f9b0..e20f28d528 100644
--- a/engines/tinsel/move.cpp
+++ b/engines/tinsel/move.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Handles walking and use of the path system.
  *
  * Contains the dodgiest code in the whole system.
@@ -581,7 +578,7 @@ static void SetMoverUltDest(PMOVER pActor, int x, int y) {
  * Set intermediate destination.
  *
  * If in final destination path, go straight to target.
- * If in a neighbouring path to the final destination, if the target path
+ * If in a neighboring path to the final destination, if the target path
  * is a follow nodes path, head for the end node, otherwise head straight
  * for the target.
  * Otherwise, head towards the pseudo-center or end node of the first
diff --git a/engines/tinsel/move.h b/engines/tinsel/move.h
index 027a89f67e..a307e5c081 100644
--- a/engines/tinsel/move.h
+++ b/engines/tinsel/move.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_MOVE_H	// prevent multiple includes
diff --git a/engines/tinsel/multiobj.cpp b/engines/tinsel/multiobj.cpp
index 9a7dac5929..c48fefdd22 100644
--- a/engines/tinsel/multiobj.cpp
+++ b/engines/tinsel/multiobj.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains utilities to handle multi-part objects.
  */
 
@@ -32,7 +29,7 @@
 namespace Tinsel {
 
 /**
- * Initialise a multi-part object using a list of images to init
+ * Initialize a multi-part object using a list of images to init
  * each object piece. One object is created for each image in the list.
  * All objects are given the same palette as the first image. A pointer
  * to the first (master) object created is returned.
@@ -93,7 +90,7 @@ OBJECT *MultiInitObject(const MULTI_INIT *pInitTbl) {
 
  */
 
-void MultiInsertObject(OBJECT *pObjList, OBJECT *pInsObj) {
+void MultiInsertObject(OBJECT **pObjList, OBJECT *pInsObj) {
 	// validate object pointer
 	assert(isValidObject(pInsObj));
 
@@ -114,7 +111,7 @@ void MultiInsertObject(OBJECT *pObjList, OBJECT *pInsObj) {
  * @param pMultiObj			Multi-part object to be deleted
  */
 
-void MultiDeleteObject(OBJECT *pObjList, OBJECT *pMultiObj) {
+void MultiDeleteObject(OBJECT **pObjList, OBJECT *pMultiObj) {
 	// validate object pointer
 	assert(isValidObject(pMultiObj));
 
diff --git a/engines/tinsel/multiobj.h b/engines/tinsel/multiobj.h
index b94d63e79f..a0f977553a 100644
--- a/engines/tinsel/multiobj.h
+++ b/engines/tinsel/multiobj.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Multi-part object definitions
  */
 
@@ -56,15 +53,15 @@ typedef MULTI_INIT *PMULTI_INIT;
 |*			Multi Object Function Prototypes		*|
 \*----------------------------------------------------------------------*/
 
-OBJECT *MultiInitObject(	// Initialise a multi-part object
+OBJECT *MultiInitObject(	// Initialize a multi-part object
 	const MULTI_INIT *pInitTbl);	// pointer to multi-object initialisation table
 
 void MultiInsertObject(		// Insert a multi-part object onto a object list
-	OBJECT *pObjList,	// list to insert multi-part object onto
+	OBJECT **pObjList,	// list to insert multi-part object onto
 	OBJECT *pInsObj);	// head of multi-part object to insert
 
 void MultiDeleteObject(		// Delete all the pieces of a multi-part object
-	OBJECT *pObjList,	// list to delete multi-part object from
+	OBJECT **pObjList,	// list to delete multi-part object from
 	OBJECT *pMultiObj);	// multi-part object to be deleted
 
 void MultiHideObject(		// Hide a multi-part object
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index 12bcff829b..d6478f5cae 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // FIXME: This code is taken from MADE and may need more work (e.g. setVolume).
diff --git a/engines/tinsel/music.h b/engines/tinsel/music.h
index 9003e60078..d43fed268d 100644
--- a/engines/tinsel/music.h
+++ b/engines/tinsel/music.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // Music class
diff --git a/engines/tinsel/object.cpp b/engines/tinsel/object.cpp
index ad02a614a5..cbe5b0a88f 100644
--- a/engines/tinsel/object.cpp
+++ b/engines/tinsel/object.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains the Object Manager code.
  */
 
@@ -165,13 +162,13 @@ void CopyObject(OBJECT *pDest, OBJECT *pSrc) {
  * @param pInsObj			Object to insert
  */
 
-void InsertObject(OBJECT *pObjList, OBJECT *pInsObj) {
-	OBJECT *pPrev, *pObj;	// object list traversal pointers
+void InsertObject(OBJECT **pObjList, OBJECT *pInsObj) {
+	OBJECT **pAnchor, *pObj;	// object list traversal pointers
 
 	// validate object pointer
 	assert(isValidObject(pInsObj));
 
-	for (pPrev = pObjList, pObj = pObjList->pNext; pObj != NULL; pPrev = pObj, pObj = pObj->pNext) {
+	for (pAnchor = pObjList, pObj = *pAnchor; pObj != NULL; pAnchor = &pObj->pNext, pObj = *pAnchor) {
 		// check Z order
 		if (pInsObj->zPos < pObj->zPos) {
 			// object Z is lower than list Z - insert here
@@ -185,9 +182,9 @@ void InsertObject(OBJECT *pObjList, OBJECT *pInsObj) {
 		}
 	}
 
-	// insert obj between pPrev and pObj
+	// insert obj between pAnchor and pObj
 	pInsObj->pNext = pObj;
-	pPrev->pNext = pInsObj;
+	*pAnchor = pInsObj;
 }
 
 
@@ -197,8 +194,8 @@ void InsertObject(OBJECT *pObjList, OBJECT *pInsObj) {
  * @param pObjList			List to delete object from
  * @param pDelObj			Object to delete
  */
-void DelObject(OBJECT *pObjList, OBJECT *pDelObj) {
-	OBJECT *pPrev, *pObj;	// object list traversal pointers
+void DelObject(OBJECT **pObjList, OBJECT *pDelObj) {
+	OBJECT **pAnchor, *pObj;	// object list traversal pointers
 	const Common::Rect rcScreen(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 
 	// validate object pointer
@@ -210,7 +207,7 @@ void DelObject(OBJECT *pObjList, OBJECT *pDelObj) {
 	assert(numObj >= 0);
 #endif
 
-	for (pPrev = pObjList, pObj = pObjList->pNext; pObj != NULL; pPrev = pObj, pObj = pObj->pNext) {
+	for (pAnchor = pObjList, pObj = *pAnchor; pObj != NULL; pAnchor = &pObj->pNext, pObj = *pAnchor) {
 		if (pObj == pDelObj) {
 			// found object to delete
 
@@ -220,7 +217,7 @@ void DelObject(OBJECT *pObjList, OBJECT *pDelObj) {
 			}
 
 			// make PREV next = OBJ next - removes OBJ from list
-			pPrev->pNext = pObj->pNext;
+			*pAnchor = pObj->pNext;
 
 			// place free list in OBJ next
 			pObj->pNext = pFreeObjects;
@@ -248,12 +245,12 @@ void DelObject(OBJECT *pObjList, OBJECT *pDelObj) {
  * Sort the specified object list in Z Y order.
  * @param pObjList			List to sort
  */
-void SortObjectList(OBJECT *pObjList) {
+void SortObjectList(OBJECT **pObjList) {
 	OBJECT *pPrev, *pObj;	// object list traversal pointers
 	OBJECT head;		// temporary head of list - because pObjList is not usually a OBJECT
 
 	// put at head of list
-	head.pNext = pObjList->pNext;
+	head.pNext = *pObjList;
 
 	// set head of list dummy OBJ Z Y values to lowest possible
 	head.yPos = intToFrac(MIN_INT16);
@@ -348,7 +345,7 @@ void GetAniPosition(OBJECT *pObj, int *pPosX, int *pPosY) {
 }
 
 /**
- * Initialise a object using a OBJ_INIT structure to supply parameters.
+ * Initialize a object using a OBJ_INIT structure to supply parameters.
  * @param pInitTbl			Pointer to object initialisation table
  */
 OBJECT *InitObject(const OBJ_INIT *pInitTbl) {
@@ -489,7 +486,7 @@ void AnimateObject(OBJECT *pAniObj, SCNHANDLE hNewImg) {
  * @param height		Height of rectangle
  */
 OBJECT *RectangleObject(SCNHANDLE hPal, int color, int width, int height) {
-	// template for initialising the rectangle object
+	// template for initializing the rectangle object
 	static const OBJ_INIT rectObj = {0, DMA_CONST, OID_EFFECTS, 0, 0, 0};
 	PALQ *pPalQ;		// palette queue pointer
 
@@ -525,7 +522,7 @@ OBJECT *RectangleObject(SCNHANDLE hPal, int color, int width, int height) {
  * @param height		Height of rectangle
  */
 OBJECT *TranslucentObject(int width, int height) {
-	// template for initialising the rectangle object
+	// template for initializing the rectangle object
 	static const OBJ_INIT rectObj = {0, DMA_TRANS, OID_EFFECTS, 0, 0, 0};
 
 	// allocate and init a new object
diff --git a/engines/tinsel/object.h b/engines/tinsel/object.h
index 9f10c06cd2..5644ddf19c 100644
--- a/engines/tinsel/object.h
+++ b/engines/tinsel/object.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Object Manager data structures
  */
 
@@ -137,24 +134,15 @@ void CopyObject(		// copy one object to another
 	OBJECT *pSrc);		// source object
 
 void InsertObject(		// insert a object onto a sorted object list
-	OBJECT *pObjList,	// list to insert object onto
+	OBJECT **pObjList,	// list to insert object onto
 	OBJECT *pInsObj);	// object to insert
 
 void DelObject(			// delete a object from a object list and add to free list
-	OBJECT *pObjList,	// list to delete object from
+	OBJECT **pObjList,	// list to delete object from
 	OBJECT *pDelObj);	// object to delete
 
 void SortObjectList(		// re-sort an object list
-	OBJECT *pObjList);	// list to sort
-
-OBJECT *GetNextObject(		// object list iterator - returns next obj in list
-	OBJECT *pObjList,	// which object list
-	OBJECT *pStrtObj);	// object to start from - when NULL will start from beginning of list
-
-OBJECT *FindObject(		// Searches the specified obj list for a object matching the specified OID
-	OBJECT *pObjList,	// object list to search
-	int oidDesired,		// object identifer of object to find
-	int oidMask);		// mask to apply to object identifiers before comparison
+	OBJECT **pObjList);	// list to sort
 
 void GetAniOffset(	// returns the anim offsets of a image, takes into account orientation
 	SCNHANDLE hImg,	// image to get animation offset of
diff --git a/engines/tinsel/palette.cpp b/engines/tinsel/palette.cpp
index 0877337603..f2437bd17e 100644
--- a/engines/tinsel/palette.cpp
+++ b/engines/tinsel/palette.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Palette Allocator for IBM PC.
  */
 
diff --git a/engines/tinsel/palette.h b/engines/tinsel/palette.h
index 694eff504d..af58a7ffbd 100644
--- a/engines/tinsel/palette.h
+++ b/engines/tinsel/palette.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Palette Allocator Definitions
  */
 
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp
index a1cc02a832..0834e7df24 100644
--- a/engines/tinsel/pcode.cpp
+++ b/engines/tinsel/pcode.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Virtual processor.
  */
 
@@ -351,7 +348,7 @@ void FreeMasterInterpretContext() {
 }
 
 /**
- * Allocate and initialise an interpret context.
+ * Allocate and initialize an interpret context.
  * Called from a process prior to Interpret().
  * @param gsort			which sort of code
  * @param hCode			Handle to code to execute
@@ -388,7 +385,7 @@ INT_CONTEXT *InitInterpretContext(GSORT gsort, SCNHANDLE hCode,	TINSEL_EVENT eve
 }
 
 /**
- * Allocate and initialise an interpret context with restored data.
+ * Allocate and initialize an interpret context with restored data.
  */
 INT_CONTEXT *RestoreInterpretContext(INT_CONTEXT *ric) {
 	INT_CONTEXT *ic;
diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h
index f31f2eb5c6..971a42d7bd 100644
--- a/engines/tinsel/pcode.h
+++ b/engines/tinsel/pcode.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Virtual processor definitions
  */
 
@@ -77,7 +74,7 @@ struct INT_CONTEXT {
 	int ip;				///< instruction pointer
 	bool bHalt;			///< set to exit interpeter
 	bool escOn;
-	int myEscape;		///< only initialised to prevent compiler warning!
+	int myEscape;		///< only initialized to prevent compiler warning!
 
 	uint32 waitNumber1;		// The waiting numbert
 	uint32 waitNumber2;		// The wait for number
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index 5022f4757a..7439c6f77d 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * CursorPositionProcess()
  * TagProcess()
  * PointProcess()
diff --git a/engines/tinsel/pdisplay.h b/engines/tinsel/pdisplay.h
index 4e19f1a78a..aefaf015bd 100644
--- a/engines/tinsel/pdisplay.h
+++ b/engines/tinsel/pdisplay.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Tag related methods
  */
 
diff --git a/engines/tinsel/pid.h b/engines/tinsel/pid.h
index d6f87bdf98..4f63045cb4 100644
--- a/engines/tinsel/pid.h
+++ b/engines/tinsel/pid.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * List of all process identifiers
  */
 
diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp
index 145634b9dd..71e07721a6 100644
--- a/engines/tinsel/play.cpp
+++ b/engines/tinsel/play.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Plays films within a scene, takes into account the actor in each 'column'.								|
  */
 
diff --git a/engines/tinsel/play.h b/engines/tinsel/play.h
index 2e981b1e2e..041b7096a8 100644
--- a/engines/tinsel/play.h
+++ b/engines/tinsel/play.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Plays films within a scene, takes into account the actor in each 'column'.
  */
 
diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp
index f49dddeef4..6fc1c65ec5 100644
--- a/engines/tinsel/polygons.cpp
+++ b/engines/tinsel/polygons.cpp
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #include "tinsel/actors.h"
@@ -1278,13 +1275,13 @@ HPOLYGON GetPolyHandle(int i) {
 
 // **************************************************************************
 //
-// Code called to initialise or wrap up a scene:
+// Code called to initialize or wrap up a scene:
 //
 // **************************************************************************
 
 /**
  * Called at the start of a scene, when all polygons have been
- * initialised, to work out which paths are adjacent to which.
+ * initialized, to work out which paths are adjacent to which.
  */
 static int DistinctCorners(HPOLYGON hp1, HPOLYGON hp2) {
 	const POLYGON *pp1, *pp2;
@@ -1596,7 +1593,7 @@ static PPOLYGON GetPolyEntry() {
 
 /**
  * Variation of  GetPolyEntry from Tinsel 1 that splits up getting a new
- * polygon structure from initialising it
+ * polygon structure from initializing it
  */
 static PPOLYGON CommonInits(PTYPE polyType, int pno, const Poly &ptp, bool bRestart) {
 	int i;
@@ -1660,14 +1657,14 @@ static void PseudoCenter(POLYGON *p) {
 }
 
 /**
- * Initialise an EXIT polygon.
+ * Initialize an EXIT polygon.
  */
 static void InitExit(const Poly &ptp, int pno, bool bRestart) {
 	CommonInits(EXIT, pno, ptp, bRestart);
 }
 
 /**
- * Initialise a PATH or NPATH polygon.
+ * Initialize a PATH or NPATH polygon.
  */
 static void InitPath(const Poly &ptp, bool NodePath, int pno, bool bRestart) {
 	PPOLYGON p = CommonInits(PATH, pno, ptp, bRestart);
@@ -1679,14 +1676,14 @@ static void InitPath(const Poly &ptp, bool NodePath, int pno, bool bRestart) {
 
 
 /**
- * Initialise a BLOCKING polygon.
+ * Initialize a BLOCKING polygon.
  */
 static void InitBlock(const Poly &ptp, int pno, bool bRestart) {
 	CommonInits(BLOCK, pno, ptp, bRestart);
 }
 
 /**
- * Initialise an extra BLOCKING polygon related to a moving actor.
+ * Initialize an extra BLOCKING polygon related to a moving actor.
  * The width of the polygon depends on the width of the actor which is
  * trying to walk through the actor you first thought of.
  * This is for dynamic blocking.
@@ -1721,7 +1718,7 @@ HPOLYGON InitExtraBlock(PMOVER ca, PMOVER ta) {
 }
 
 /**
- * Initialise an EFFECT polygon.
+ * Initialize an EFFECT polygon.
  */
 static void InitEffect(const Poly &ptp, int pno, bool bRestart) {
 	CommonInits(EFFECT, pno, ptp, bRestart);
@@ -1729,7 +1726,7 @@ static void InitEffect(const Poly &ptp, int pno, bool bRestart) {
 
 
 /**
- * Initialise a REFER polygon.
+ * Initialize a REFER polygon.
  */
 static void InitRefer(const Poly &ptp, int pno, bool bRestart) {
 	PPOLYGON p = CommonInits(REFER, pno, ptp, bRestart);
@@ -1739,7 +1736,7 @@ static void InitRefer(const Poly &ptp, int pno, bool bRestart) {
 
 
 /**
- * Initialise a TAG polygon.
+ * Initialize a TAG polygon.
  */
 static void InitTag(const Poly &ptp, int pno, bool bRestart) {
 	CommonInits(TAG, pno, ptp, bRestart);
@@ -1784,7 +1781,7 @@ static void KillDeadPolygons() {
 }
 
 /**
- * Called at the start of a scene to initialise the polys in that scene.
+ * Called at the start of a scene to initialize the polys in that scene.
  */
 void InitPolygons(SCNHANDLE ph, int numPoly, bool bRestart) {
 	pHandle = ph;
diff --git a/engines/tinsel/polygons.h b/engines/tinsel/polygons.h
index cf8f9e98c2..6d36d555d8 100644
--- a/engines/tinsel/polygons.h
+++ b/engines/tinsel/polygons.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Definition of POLYGON structure and functions in POLYGONS.C
  */
 
diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp
index 38ac0a2ce6..ca196aac92 100644
--- a/engines/tinsel/rince.cpp
+++ b/engines/tinsel/rince.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Should really be called "moving actors.c"
  */
 
diff --git a/engines/tinsel/rince.h b/engines/tinsel/rince.h
index 5d09a1e945..93fd191172 100644
--- a/engines/tinsel/rince.h
+++ b/engines/tinsel/rince.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Should really be called "moving actors.h"
  */
 
diff --git a/engines/tinsel/saveload.cpp b/engines/tinsel/saveload.cpp
index 50f6d8d00b..caaf9a13f8 100644
--- a/engines/tinsel/saveload.cpp
+++ b/engines/tinsel/saveload.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Save and restore scene and game.
  */
 
diff --git a/engines/tinsel/savescn.cpp b/engines/tinsel/savescn.cpp
index aa359d281f..89d68a611e 100644
--- a/engines/tinsel/savescn.cpp
+++ b/engines/tinsel/savescn.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Save and restore scene and game.
  */
 
@@ -153,14 +150,14 @@ void DoRestoreScene(SAVED_DATA *sd, bool bFadeOut) {
 		RestoreSceneCount = RS_COUNT;	// Set restore scene count
 }
 
-void InitialiseSaveScenes() {
+void InitializeSaveScenes() {
 	if (ssData == NULL) {
 		ssData = (SAVED_DATA *)calloc(MAX_NEST, sizeof(SAVED_DATA));
 		if (ssData == NULL) {
 			error("Cannot allocate memory for scene changes");
 		}
 	} else {
-		// Re-initialise - no scenes saved
+		// Re-initialize - no scenes saved
 		savedSceneCount = 0;
 	}
 }
diff --git a/engines/tinsel/savescn.h b/engines/tinsel/savescn.h
index 271cdd5eb1..894af0d6b8 100644
--- a/engines/tinsel/savescn.h
+++ b/engines/tinsel/savescn.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Should really be called "moving actors.h"
  */
 
@@ -99,7 +96,7 @@ void ProcessSRQueue();
 void RequestSaveGame(char *name, char *desc, SAVED_DATA *sd, int *ssCount, SAVED_DATA *ssData);
 void RequestRestoreGame(int num, SAVED_DATA *sd, int *ssCount, SAVED_DATA *ssData);
 
-void InitialiseSaveScenes();
+void InitializeSaveScenes();
 void FreeSaveScenes();
 
 } // End of namespace Tinsel
diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp
index b82bac32cc..89b0da7d65 100644
--- a/engines/tinsel/scene.cpp
+++ b/engines/tinsel/scene.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Starts up new scenes.
  */
 
@@ -204,8 +201,8 @@ void SendSceneTinselProcess(TINSEL_EVENT event) {
 
 /**
  * Get the SCENE_STRUC
- * Initialise polygons for the scene
- * Initialise the actors for this scene
+ * Initialize polygons for the scene
+ * Initialize the actors for this scene
  * Run the appropriate entrance code (if any)
  * Get the default refer type
  */
@@ -247,10 +244,10 @@ static void LoadScene(SCNHANDLE scene, int entry) {
 	if (entry == NO_ENTRY_NUM) {
 		// Restoring scene
 
-		// Initialise all the polygons for this scene
+		// Initialize all the polygons for this scene
 		InitPolygons(FROM_LE_32(ss->hPoly), FROM_LE_32(ss->numPoly), true);
 
-		// Initialise the actors for this scene
+		// Initialize the actors for this scene
 		StartTaggedActors(FROM_LE_32(ss->hTaggedActor), FROM_LE_32(ss->numTaggedActor), false);
 
 		if (TinselV2)
@@ -260,10 +257,10 @@ static void LoadScene(SCNHANDLE scene, int entry) {
 	} else {
 		// Genuine new scene
 
-		// Initialise all the polygons for this scene
+		// Initialize all the polygons for this scene
 		InitPolygons(FROM_LE_32(ss->hPoly), FROM_LE_32(ss->numPoly), false);
 
-		// Initialise the actors for this scene
+		// Initialize the actors for this scene
 		StartTaggedActors(FROM_LE_32(ss->hTaggedActor), FROM_LE_32(ss->numTaggedActor), true);
 
 		// Run the appropriate entrance code (if any)
diff --git a/engines/tinsel/scene.h b/engines/tinsel/scene.h
index 2ef7da1289..baaff27a3e 100644
--- a/engines/tinsel/scene.h
+++ b/engines/tinsel/scene.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Scene parsing defines
  */
 
diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp
index 37c04abd22..b24d6bf9b8 100644
--- a/engines/tinsel/sched.cpp
+++ b/engines/tinsel/sched.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Process scheduler.
  */
 
diff --git a/engines/tinsel/sched.h b/engines/tinsel/sched.h
index bfeaa8750a..a1eafcdc47 100644
--- a/engines/tinsel/sched.h
+++ b/engines/tinsel/sched.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Data structures used by the process scheduler
  */
 
diff --git a/engines/tinsel/scn.cpp b/engines/tinsel/scn.cpp
index 20d75b6b93..70093447ff 100644
--- a/engines/tinsel/scn.cpp
+++ b/engines/tinsel/scn.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * A (some would say very) small collection of utility functions.
  */
 
diff --git a/engines/tinsel/scn.h b/engines/tinsel/scn.h
index c9cafd9eea..2e3a02cdda 100644
--- a/engines/tinsel/scn.h
+++ b/engines/tinsel/scn.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_SCN_H	// prevent multiple includes
diff --git a/engines/tinsel/scroll.cpp b/engines/tinsel/scroll.cpp
index 3da970915f..d75e649be3 100644
--- a/engines/tinsel/scroll.cpp
+++ b/engines/tinsel/scroll.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Handles scrolling
  */
 
@@ -419,7 +416,7 @@ void ScrollProcess(CORO_PARAM, const void *) {
 	CORO_BEGIN_CODE(_ctx);
 
 	// In Tinsel v2, scenes may play movies, so the background may not always
-	// already be initialised like it is in v1
+	// already be initialized like it is in v1
 	while (!GetBgObject())
 		CORO_SLEEP(1);
 
diff --git a/engines/tinsel/scroll.h b/engines/tinsel/scroll.h
index 438b049069..62562b20b2 100644
--- a/engines/tinsel/scroll.h
+++ b/engines/tinsel/scroll.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_SCROLL_H	// prevent multiple includes
diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp
index ec42ca5da4..bf48dd1511 100644
--- a/engines/tinsel/sound.cpp
+++ b/engines/tinsel/sound.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * sound functionality
  */
 
diff --git a/engines/tinsel/sound.h b/engines/tinsel/sound.h
index 2b0ef4599e..d7083b3b21 100644
--- a/engines/tinsel/sound.h
+++ b/engines/tinsel/sound.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * This file contains the Sound Driver data structures etc.
  */
 
diff --git a/engines/tinsel/strres.cpp b/engines/tinsel/strres.cpp
index 2dc0e833d1..f3a7278993 100644
--- a/engines/tinsel/strres.cpp
+++ b/engines/tinsel/strres.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * String resource managment routines
  */
 
diff --git a/engines/tinsel/strres.h b/engines/tinsel/strres.h
index 497259584c..a63824a863 100644
--- a/engines/tinsel/strres.h
+++ b/engines/tinsel/strres.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * String resource managment routines
  */
 
diff --git a/engines/tinsel/sysvar.cpp b/engines/tinsel/sysvar.cpp
index ad795fd219..88053f15c6 100644
--- a/engines/tinsel/sysvar.cpp
+++ b/engines/tinsel/sysvar.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * System variable handling.
  */
 
@@ -115,7 +112,7 @@ static SCNHANDLE systemStrings[SS_MAX_VALID];	// FIXME: Avoid non-const global v
 //----------------- FUNCTIONS --------------------------------
 
 /**
- * Initialises the system variable list
+ * Initializes the system variable list
  */
 
 void InitSysVars() {
diff --git a/engines/tinsel/sysvar.h b/engines/tinsel/sysvar.h
index 4cdb1364b4..65bf558433 100644
--- a/engines/tinsel/sysvar.h
+++ b/engines/tinsel/sysvar.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * System variable handling.
  */
 
diff --git a/engines/tinsel/text.cpp b/engines/tinsel/text.cpp
index 3652d6ed3e..ecb1e153f3 100644
--- a/engines/tinsel/text.cpp
+++ b/engines/tinsel/text.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Text utilities.
  */
 
@@ -107,7 +104,7 @@ int JustifyText(char *szStr, int xPos, const FONT *pFont, int mode) {
  * @param mode			Mode flags for the string
  * @param sleepTime		Sleep time between each character (if non-zero)
  */
-OBJECT *ObjectTextOut(OBJECT *pList, char *szStr, int color,
+OBJECT *ObjectTextOut(OBJECT **pList, char *szStr, int color,
 					  int xPos, int yPos, SCNHANDLE hFont, int mode, int sleepTime) {
 	int xJustify;	// x position of text after justification
 	int yOffset;	// offset to next line of text
diff --git a/engines/tinsel/text.h b/engines/tinsel/text.h
index ea804f58d7..4c80300c46 100644
--- a/engines/tinsel/text.h
+++ b/engines/tinsel/text.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Text utility defines
  */
 
@@ -98,7 +95,7 @@ struct TEXTOUT {
  * @param mode			mode flags for the string
  * @param sleepTime		Sleep time between each character (if non-zero)
  */
-OBJECT *ObjectTextOut(OBJECT *pList, char *szStr, int color,
+OBJECT *ObjectTextOut(OBJECT **pList, char *szStr, int color,
 					int xPos, int yPos, SCNHANDLE hFont, int mode, int sleepTime = 0);
 
 OBJECT *ObjectTextOutIndirect(	// output a string of text
diff --git a/engines/tinsel/timers.cpp b/engines/tinsel/timers.cpp
index c1a4cd0ff5..1c3ff9b260 100644
--- a/engines/tinsel/timers.cpp
+++ b/engines/tinsel/timers.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Handles timers.
  *
  * Note: As part of the transition to ScummVM, the ticks field of a timer has been changed
diff --git a/engines/tinsel/timers.h b/engines/tinsel/timers.h
index 1456d9a1d5..9bf85d9c35 100644
--- a/engines/tinsel/timers.h
+++ b/engines/tinsel/timers.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Handles timers.
  */
 
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index afd409ce27..7613c1a897 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Glitter library functions.
  *
  * In the main called only from PCODE.C
@@ -2752,7 +2749,7 @@ static void SetTag(CORO_PARAM, int tagno) {
 }
 
 /**
- * Initialise a timer.
+ * Initialize a timer.
  */
 static void SetTimer(int timerno, int start, bool up, bool frame) {
 	StartTimer(timerno, start, up != 0, frame != 0);
@@ -3002,7 +2999,7 @@ static void StartProcess(CORO_PARAM, uint32 procID) {
 }
 
 /**
- * Initialise a timer.
+ * Initialize a timer.
  */
 static void StartTimerFn(int timerno, int start, bool up, int fs) {
 	StartTimer(timerno, start, up, fs);
diff --git a/engines/tinsel/tinlib.h b/engines/tinsel/tinlib.h
index 7bd2a19d55..7c8c2ffbf6 100644
--- a/engines/tinsel/tinlib.h
+++ b/engines/tinsel/tinlib.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * Text utility defines
  */
 
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 20d4f1d31a..6c1898b08c 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -18,16 +18,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/debug-channels.h"
 #include "common/endian.h"
 #include "common/error.h"
 #include "common/events.h"
-#include "common/EventRecorder.h"
 #include "common/keyboard.h"
 #include "common/fs.h"
 #include "common/config-manager.h"
@@ -709,7 +705,7 @@ void LoadBasicChunks() {
 	int numObjects;
 
 	// Allocate RAM for savescene data
-	InitialiseSaveScenes();
+	InitializeSaveScenes();
 
 	// CHUNK_TOTAL_ACTORS seems to be missing in the released version, hard coding a value
 	// TODO: Would be nice to just change 511 to MAX_SAVED_ALIVES
@@ -818,7 +814,7 @@ const char *TinselEngine::_textFiles[][3] = {
 
 
 TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) :
-		Engine(syst), _gameDescription(gameDesc) {
+		Engine(syst), _gameDescription(gameDesc), _random("tinsel") {
 	_vm = this;
 
 	_config = new Config(this);
@@ -909,8 +905,6 @@ Common::Error TinselEngine::run() {
 		_screenSurface.create(320, 200, Graphics::PixelFormat::createFormatCLUT8());
 	}
 
-	g_eventRec.registerRandomSource(_random, "tinsel");
-
 	_console = new Console();
 
 	_scheduler = new Scheduler();
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index 35ea43074c..d0875f9fdf 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_H
diff --git a/engines/tinsel/token.cpp b/engines/tinsel/token.cpp
index fe152edcaa..c7490a100b 100644
--- a/engines/tinsel/token.cpp
+++ b/engines/tinsel/token.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  * To ensure exclusive use of resources and exclusive control responsibilities.
  */
 
diff --git a/engines/tinsel/token.h b/engines/tinsel/token.h
index b750b92ae4..8169ef1c7a 100644
--- a/engines/tinsel/token.h
+++ b/engines/tinsel/token.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef TINSEL_TOKEN_H