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

Conflicts:
	engines/groovie/script.cpp

61 files changed, 49 insertions, 237 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 56501b5294..4d879909c4 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -18,13 +18,9 @@
  * 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/config-manager.h"
-#include "common/EventRecorder.h"
 #include "common/file.h"
 #include "common/fs.h"
 #include "common/textconsole.h"
@@ -60,8 +56,8 @@ static const GameSpecificSettings puzzlepack_settings = {
 };
 
 #ifdef ENABLE_AGOS2
-AGOSEngine_DIMP::AGOSEngine_DIMP(OSystem *system)
-	: AGOSEngine_PuzzlePack(system) {
+AGOSEngine_DIMP::AGOSEngine_DIMP(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_PuzzlePack(system, gd) {
 
 	_iconToggleCount = 0;
 	_voiceCount = 0;
@@ -71,24 +67,24 @@ AGOSEngine_DIMP::AGOSEngine_DIMP(OSystem *system)
 	_tSecondCount = 0;
 }
 
-AGOSEngine_PuzzlePack::AGOSEngine_PuzzlePack(OSystem *system)
-	: AGOSEngine_Feeble(system) {
+AGOSEngine_PuzzlePack::AGOSEngine_PuzzlePack(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_Feeble(system, gd) {
 
 	_oopsValid = false;
 	_gameTime = 0;
 }
 #endif
 
-AGOSEngine_Simon2::AGOSEngine_Simon2(OSystem *system)
-	: AGOSEngine_Simon1(system) {
+AGOSEngine_Simon2::AGOSEngine_Simon2(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_Simon1(system, gd) {
 }
 
-AGOSEngine_Simon1::AGOSEngine_Simon1(OSystem *system)
-	: AGOSEngine_Waxworks(system) {
+AGOSEngine_Simon1::AGOSEngine_Simon1(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_Waxworks(system, gd) {
 }
 
-AGOSEngine_Waxworks::AGOSEngine_Waxworks(OSystem *system)
-	: AGOSEngine_Elvira2(system) {
+AGOSEngine_Waxworks::AGOSEngine_Waxworks(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_Elvira2(system, gd) {
 
 	_boxCR = false;
 	_boxLineCount = 0;
@@ -104,16 +100,16 @@ AGOSEngine_Waxworks::AGOSEngine_Waxworks(OSystem *system)
 	memset(_lineCounts, 0, sizeof(_lineCounts));
 }
 
-AGOSEngine_Elvira2::AGOSEngine_Elvira2(OSystem *system)
-	: AGOSEngine_Elvira1(system) {
+AGOSEngine_Elvira2::AGOSEngine_Elvira2(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_Elvira1(system, gd) {
 }
 
-AGOSEngine_Elvira1::AGOSEngine_Elvira1(OSystem *system)
-	: AGOSEngine(system) {
+AGOSEngine_Elvira1::AGOSEngine_Elvira1(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine(system, gd) {
 }
 
-AGOSEngine::AGOSEngine(OSystem *syst)
-	: Engine(syst) {
+AGOSEngine::AGOSEngine(OSystem *system, const AGOSGameDescription *gd)
+	: Engine(system), _rnd("agos"), _gameDescription(gd) {
 
 	_vcPtr = 0;
 	_vcGetOutOfCode = 0;
@@ -529,8 +525,6 @@ AGOSEngine::AGOSEngine(OSystem *syst)
 	SearchMan.addSubDirectoryMatching(gameDataDir, "movies");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "sfx");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "speech");
-
-	g_eventRec.registerRandomSource(_rnd, "agos");
 }
 
 Common::Error AGOSEngine::init() {
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index aecf2437a7..aa68a05eee 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.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 AGOS_AGOS_H
@@ -179,6 +176,7 @@ class Debugger;
 #endif
 
 class AGOSEngine : public Engine {
+protected:
 	friend class Debugger;
 
 	// Engine APIs
@@ -196,7 +194,6 @@ class AGOSEngine : public Engine {
 	virtual void syncSoundSettings();
 	virtual void pauseEngineIntern(bool pause);
 
-public:
 	virtual void setupOpcodes();
 	uint16 _numOpcodes, _opcode;
 
@@ -208,8 +205,9 @@ public:
 
 	virtual void setupVideoOpcodes(VgaOpcodeProc *op);
 
-	const AGOSGameDescription *_gameDescription;
+	const AGOSGameDescription * const _gameDescription;
 
+public:
 	virtual void setupGame();
 
 	int getGameId() const;
@@ -587,7 +585,7 @@ protected:
 	byte _hebrewCharWidths[32];
 
 public:
-	AGOSEngine(OSystem *syst);
+	AGOSEngine(OSystem *system, const AGOSGameDescription *gd);
 	virtual ~AGOSEngine();
 
 	byte *_curSfxFile;
@@ -1284,7 +1282,7 @@ class AGOSEngine_PN : public AGOSEngine {
 	void setupBoxes();
 	int readfromline();
 public:
-	AGOSEngine_PN(OSystem *system);
+	AGOSEngine_PN(OSystem *system, const AGOSGameDescription *gd);
 	~AGOSEngine_PN();
 
 	virtual void setupGame();
@@ -1526,7 +1524,7 @@ protected:
 
 class AGOSEngine_Elvira1 : public AGOSEngine {
 public:
-	AGOSEngine_Elvira1(OSystem *system);
+	AGOSEngine_Elvira1(OSystem *system, const AGOSGameDescription *gd);
 	//~AGOSEngine_Elvira1();
 
 	virtual void setupGame();
@@ -1607,7 +1605,7 @@ protected:
 
 class AGOSEngine_Elvira2 : public AGOSEngine_Elvira1 {
 public:
-	AGOSEngine_Elvira2(OSystem *system);
+	AGOSEngine_Elvira2(OSystem *system, const AGOSGameDescription *gd);
 	//~AGOSEngine_Elvira2();
 
 	virtual void setupGame();
@@ -1702,7 +1700,7 @@ protected:
 
 class AGOSEngine_Waxworks : public AGOSEngine_Elvira2 {
 public:
-	AGOSEngine_Waxworks(OSystem *system);
+	AGOSEngine_Waxworks(OSystem *system, const AGOSGameDescription *gd);
 	//~AGOSEngine_Waxworks();
 
 	virtual void setupGame();
@@ -1769,7 +1767,7 @@ protected:
 
 class AGOSEngine_Simon1 : public AGOSEngine_Waxworks {
 public:
-	AGOSEngine_Simon1(OSystem *system);
+	AGOSEngine_Simon1(OSystem *system, const AGOSGameDescription *gd);
 	//~AGOSEngine_Simon1();
 
 	virtual void setupGame();
@@ -1840,7 +1838,7 @@ protected:
 
 class AGOSEngine_Simon2 : public AGOSEngine_Simon1 {
 public:
-	AGOSEngine_Simon2(OSystem *system);
+	AGOSEngine_Simon2(OSystem *system, const AGOSGameDescription *gd);
 	//~AGOSEngine_Simon2();
 
 	virtual void setupGame();
@@ -1887,7 +1885,7 @@ protected:
 #ifdef ENABLE_AGOS2
 class AGOSEngine_Feeble : public AGOSEngine_Simon2 {
 public:
-	AGOSEngine_Feeble(OSystem *system);
+	AGOSEngine_Feeble(OSystem *system, const AGOSGameDescription *gd);
 	~AGOSEngine_Feeble();
 
 	virtual void setupGame();
@@ -2026,7 +2024,7 @@ protected:
 
 class AGOSEngine_FeebleDemo : public AGOSEngine_Feeble {
 public:
-	AGOSEngine_FeebleDemo(OSystem *system);
+	AGOSEngine_FeebleDemo(OSystem *system, const AGOSGameDescription *gd);
 
 protected:
 	bool _filmMenuUsed;
@@ -2047,7 +2045,7 @@ protected:
 
 class AGOSEngine_PuzzlePack : public AGOSEngine_Feeble {
 public:
-	AGOSEngine_PuzzlePack(OSystem *system);
+	AGOSEngine_PuzzlePack(OSystem *system, const AGOSGameDescription *gd);
 	//~AGOSEngine_PuzzlePack();
 
 	virtual void setupGame();
@@ -2106,7 +2104,7 @@ protected:
 
 class AGOSEngine_DIMP : public AGOSEngine_PuzzlePack {
 public:
-	AGOSEngine_DIMP(OSystem *system);
+	AGOSEngine_DIMP(OSystem *system, const AGOSGameDescription *gd);
 	//~AGOSEngine_DIMP();
 
 	virtual void setupOpcodes();
diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp
index ee47f62a58..eb78ca3d9b 100644
--- a/engines/agos/animation.cpp
+++ b/engines/agos/animation.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$
- *
  */
 
 
diff --git a/engines/agos/animation.h b/engines/agos/animation.h
index 77b02ffd13..e1d7207251 100644
--- a/engines/agos/animation.h
+++ b/engines/agos/animation.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$
- *
  */
 
 #ifdef ENABLE_AGOS2
diff --git a/engines/agos/charset-fontdata.cpp b/engines/agos/charset-fontdata.cpp
index a131bb841b..b708b4890b 100644
--- a/engines/agos/charset-fontdata.cpp
+++ b/engines/agos/charset-fontdata.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$
- *
  */
 
 
diff --git a/engines/agos/charset.cpp b/engines/agos/charset.cpp
index 5e9279c491..9d27afaa27 100644
--- a/engines/agos/charset.cpp
+++ b/engines/agos/charset.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$
- *
  */
 
 
diff --git a/engines/agos/contain.cpp b/engines/agos/contain.cpp
index 932557e798..ba60c65ff3 100644
--- a/engines/agos/contain.cpp
+++ b/engines/agos/contain.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$
- *
  */
 
 
diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp
index cf42fe1f36..ef4a1406c9 100644
--- a/engines/agos/cursor.cpp
+++ b/engines/agos/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$
- *
  */
 
 
diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index bb27557a6b..9c44342975 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.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$
- *
  */
 
 // AGOS debug functions
diff --git a/engines/agos/debug.h b/engines/agos/debug.h
index 5865065ac3..fd5908997f 100644
--- a/engines/agos/debug.h
+++ b/engines/agos/debug.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 AGOS_DEBUG_H
diff --git a/engines/agos/debugger.cpp b/engines/agos/debugger.cpp
index 5f46a9bc93..a313dbbd1e 100644
--- a/engines/agos/debugger.cpp
+++ b/engines/agos/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$
- *
  */
 
 
diff --git a/engines/agos/debugger.h b/engines/agos/debugger.h
index 43c04c67c2..0ab992ebbe 100644
--- a/engines/agos/debugger.h
+++ b/engines/agos/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 AGOS_DEBUGGER_H
diff --git a/engines/agos/detection.cpp b/engines/agos/detection.cpp
index c8c70c0ecc..629a5d63fc 100644
--- a/engines/agos/detection.cpp
+++ b/engines/agos/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"
@@ -151,44 +148,41 @@ bool AgosMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGame
 
 	switch (gd->gameType) {
 	case AGOS::GType_PN:
-		*engine = new AGOS::AGOSEngine_PN(syst);
+		*engine = new AGOS::AGOSEngine_PN(syst, gd);
 		break;
 	case AGOS::GType_ELVIRA1:
-		*engine = new AGOS::AGOSEngine_Elvira1(syst);
+		*engine = new AGOS::AGOSEngine_Elvira1(syst, gd);
 		break;
 	case AGOS::GType_ELVIRA2:
-		*engine = new AGOS::AGOSEngine_Elvira2(syst);
+		*engine = new AGOS::AGOSEngine_Elvira2(syst, gd);
 		break;
 	case AGOS::GType_WW:
-		*engine = new AGOS::AGOSEngine_Waxworks(syst);
+		*engine = new AGOS::AGOSEngine_Waxworks(syst, gd);
 		break;
 	case AGOS::GType_SIMON1:
-		*engine = new AGOS::AGOSEngine_Simon1(syst);
+		*engine = new AGOS::AGOSEngine_Simon1(syst, gd);
 		break;
 	case AGOS::GType_SIMON2:
-		*engine = new AGOS::AGOSEngine_Simon2(syst);
+		*engine = new AGOS::AGOSEngine_Simon2(syst, gd);
 		break;
 #ifdef ENABLE_AGOS2
 	case AGOS::GType_FF:
 		if (gd->features & GF_DEMO)
-			*engine = new AGOS::AGOSEngine_FeebleDemo(syst);
+			*engine = new AGOS::AGOSEngine_FeebleDemo(syst, gd);
 		else
-			*engine = new AGOS::AGOSEngine_Feeble(syst);
+			*engine = new AGOS::AGOSEngine_Feeble(syst, gd);
 		break;
 	case AGOS::GType_PP:
 		if (gd->gameId == GID_DIMP)
-			*engine = new AGOS::AGOSEngine_DIMP(syst);
+			*engine = new AGOS::AGOSEngine_DIMP(syst, gd);
 		else
-			*engine = new AGOS::AGOSEngine_PuzzlePack(syst);
+			*engine = new AGOS::AGOSEngine_PuzzlePack(syst, gd);
 		break;
 #endif
 	default:
 		res = false;
 		error("AGOS engine: unknown gameType");
 	}
-	if (res) {
-		((AGOS::AGOSEngine *)*engine)->_gameDescription = gd;
-	}
 
 	return res;
 }
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index 963c08849c..a43d581173 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/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 AGOS {
diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index 6b9f65ee2b..4d66b56a96 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.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$
- *
  */
 
 
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 8799dbaa28..3411e6d632 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.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$
- *
  */
 
 
diff --git a/engines/agos/feeble.cpp b/engines/agos/feeble.cpp
index 843298c6d7..4c82b7e19d 100644
--- a/engines/agos/feeble.cpp
+++ b/engines/agos/feeble.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$
- *
  */
 
 
@@ -35,8 +32,8 @@
 
 namespace AGOS {
 
-AGOSEngine_Feeble::AGOSEngine_Feeble(OSystem *system)
-	: AGOSEngine_Simon2(system) {
+AGOSEngine_Feeble::AGOSEngine_Feeble(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_Simon2(system, gd) {
 
 	_interactiveVideo = 0;
 	_moviePlayer = 0;
@@ -111,8 +108,8 @@ void AGOSEngine_Feeble::stopInteractiveVideo() {
 	}
 }
 
-AGOSEngine_FeebleDemo::AGOSEngine_FeebleDemo(OSystem *system)
-	: AGOSEngine_Feeble(system) {
+AGOSEngine_FeebleDemo::AGOSEngine_FeebleDemo(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine_Feeble(system, gd) {
 
 	_filmMenuUsed = 0;
 }
diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp
index 4c998dfa5f..0b045bae01 100644
--- a/engines/agos/gfx.cpp
+++ b/engines/agos/gfx.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$
- *
  */
 
 
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index 39a7705c54..ead4e49ebb 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.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$
- *
  */
 
 
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 1246149aa5..2ab543a943 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.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$
- *
  */
 
 
diff --git a/engines/agos/input_pn.cpp b/engines/agos/input_pn.cpp
index 9c35fbb3a2..9cc97ff10f 100644
--- a/engines/agos/input_pn.cpp
+++ b/engines/agos/input_pn.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$
- *
  */
 
 
diff --git a/engines/agos/intern.h b/engines/agos/intern.h
index 2f5fc6278f..18f56be4a4 100644
--- a/engines/agos/intern.h
+++ b/engines/agos/intern.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 AGOS_INTERN_H
diff --git a/engines/agos/items.cpp b/engines/agos/items.cpp
index 5d1523bbd5..0fb873a733 100644
--- a/engines/agos/items.cpp
+++ b/engines/agos/items.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$
- *
  */
 
 
diff --git a/engines/agos/menus.cpp b/engines/agos/menus.cpp
index 2b103a75cb..4d62e34820 100644
--- a/engines/agos/menus.cpp
+++ b/engines/agos/menus.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$
- *
  */
 
 
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 26e2f2c736..88f6dd80d1 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.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$
- *
  */
 
 
@@ -153,7 +150,7 @@ void MidiPlayer::send(uint32 b) {
 			// We have received a "Reset All Controllers" message
 			// and passed it on to the MIDI driver. This may or may
 			// not have affected the volume controller. To ensure
-			// consistent behaviour, explicitly set the volume to
+			// consistent behavior, explicitly set the volume to
 			// what we think it should be.
 
 			if (_current == &_sfx)
diff --git a/engines/agos/midi.h b/engines/agos/midi.h
index 40f54dbaf0..635e091906 100644
--- a/engines/agos/midi.h
+++ b/engines/agos/midi.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 AGOS_MIDI_H
diff --git a/engines/agos/midiparser_s1d.cpp b/engines/agos/midiparser_s1d.cpp
index f96518b5e9..01690247f0 100644
--- a/engines/agos/midiparser_s1d.cpp
+++ b/engines/agos/midiparser_s1d.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/debug.h"
diff --git a/engines/agos/oracle.cpp b/engines/agos/oracle.cpp
index 8ff79965e4..2a3c668c08 100644
--- a/engines/agos/oracle.cpp
+++ b/engines/agos/oracle.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$
- *
  */
 
 
diff --git a/engines/agos/pn.cpp b/engines/agos/pn.cpp
index 62d65de219..667a5c3fc8 100644
--- a/engines/agos/pn.cpp
+++ b/engines/agos/pn.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/config-manager.h"
@@ -30,8 +27,8 @@
 
 namespace AGOS {
 
-AGOSEngine_PN::AGOSEngine_PN(OSystem *system)
-	: AGOSEngine(system) {
+AGOSEngine_PN::AGOSEngine_PN(OSystem *system, const AGOSGameDescription *gd)
+	: AGOSEngine(system, gd) {
 
 	_stackbase = 0;
 	_tagOfActiveDoline = 0;
diff --git a/engines/agos/res.cpp b/engines/agos/res.cpp
index 0e818963e2..a71d4d8150 100644
--- a/engines/agos/res.cpp
+++ b/engines/agos/res.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$
- *
  */
 
 // Resource file routines for Simon1/Simon2
diff --git a/engines/agos/res_ami.cpp b/engines/agos/res_ami.cpp
index 35432e1cc4..b83d10364a 100644
--- a/engines/agos/res_ami.cpp
+++ b/engines/agos/res_ami.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$
- *
  */
 
 // Conversion routines for planar graphics in Amiga versions
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 34deff37ab..819af4fa40 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.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/config-manager.h"
diff --git a/engines/agos/rooms.cpp b/engines/agos/rooms.cpp
index 0993197594..f2629e419e 100644
--- a/engines/agos/rooms.cpp
+++ b/engines/agos/rooms.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$
- *
  */
 
 
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index d6f25814bb..e6cce36b22 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/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$
- *
  */
 
 #include "common/file.h"
@@ -38,7 +35,7 @@
 namespace AGOS {
 
 int AGOSEngine::countSaveGames() {
-	Common::InSaveFile *f;
+	Common::InSaveFile *f = NULL;
 	Common::StringArray filenames;
 	uint i = 1;
 	char slot[4];
diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp
index 94a3f371cc..68a90e405b 100644
--- a/engines/agos/script.cpp
+++ b/engines/agos/script.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$
- *
  */
 
 // Item script opcodes for Simon1/Simon2
diff --git a/engines/agos/script_dp.cpp b/engines/agos/script_dp.cpp
index 6eb3ca4779..a4ee249f47 100644
--- a/engines/agos/script_dp.cpp
+++ b/engines/agos/script_dp.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$
- *
  */
 
 
diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp
index df37a38a7c..c7a2f5b0a2 100644
--- a/engines/agos/script_e1.cpp
+++ b/engines/agos/script_e1.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$
- *
  */
 
 
diff --git a/engines/agos/script_e2.cpp b/engines/agos/script_e2.cpp
index f8af7db214..79a7e89a89 100644
--- a/engines/agos/script_e2.cpp
+++ b/engines/agos/script_e2.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$
- *
  */
 
 
diff --git a/engines/agos/script_ff.cpp b/engines/agos/script_ff.cpp
index 8dfee7f7c7..e2a4d0820f 100644
--- a/engines/agos/script_ff.cpp
+++ b/engines/agos/script_ff.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$
- *
  */
 
 
diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp
index b8ba7fb015..bde59b71b8 100644
--- a/engines/agos/script_pn.cpp
+++ b/engines/agos/script_pn.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 "agos/agos.h"
diff --git a/engines/agos/script_pp.cpp b/engines/agos/script_pp.cpp
index 624a1bbeba..0a599506b5 100644
--- a/engines/agos/script_pp.cpp
+++ b/engines/agos/script_pp.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$
- *
  */
 
 
diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp
index dab0302631..0e7e66778e 100644
--- a/engines/agos/script_s1.cpp
+++ b/engines/agos/script_s1.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$
- *
  */
 
 
diff --git a/engines/agos/script_s2.cpp b/engines/agos/script_s2.cpp
index a0b14525f2..c646397ac3 100644
--- a/engines/agos/script_s2.cpp
+++ b/engines/agos/script_s2.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$
- *
  */
 
 
diff --git a/engines/agos/script_ww.cpp b/engines/agos/script_ww.cpp
index 679c67df64..29a91a15aa 100644
--- a/engines/agos/script_ww.cpp
+++ b/engines/agos/script_ww.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$
- *
  */
 
 
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index 25d861acb5..03932aa4de 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/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$
- *
  */
 
 #include "common/file.h"
diff --git a/engines/agos/sound.h b/engines/agos/sound.h
index 9739cfb58f..a7c4cd73db 100644
--- a/engines/agos/sound.h
+++ b/engines/agos/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$
- *
  */
 
 #ifndef AGOS_SOUND_H
diff --git a/engines/agos/string.cpp b/engines/agos/string.cpp
index 1152d6ed04..1cdd7f6d81 100644
--- a/engines/agos/string.cpp
+++ b/engines/agos/string.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$
- *
  */
 
 
diff --git a/engines/agos/string_pn.cpp b/engines/agos/string_pn.cpp
index 92d85ab96c..570fbc6200 100644
--- a/engines/agos/string_pn.cpp
+++ b/engines/agos/string_pn.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 "agos/agos.h"
@@ -134,7 +131,7 @@ void AGOSEngine_PN::pcf(uint8 ch) {
 	if (ch == 255) {
 		_bp = 0;
 		_xofs = 0;
-		return;		/* pcf(255) initialises the routine */
+		return;		/* pcf(255) initializes the routine */
 	}			/* pcf(254) flushes its working _buffer */
 	if (ch != 254) {
 		if ((ch != 32) || (_bp + _xofs != 50))
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index bd07596a46..bd9abb16b5 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.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$
- *
  */
 
 
diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp
index b05bac1e57..abc45c1ace 100644
--- a/engines/agos/verb.cpp
+++ b/engines/agos/verb.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$
- *
  */
 
 // Verb and hitarea handling
diff --git a/engines/agos/verb_pn.cpp b/engines/agos/verb_pn.cpp
index b36f634ec0..19e8bb2d48 100644
--- a/engines/agos/verb_pn.cpp
+++ b/engines/agos/verb_pn.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$
- *
  */
 
 // Verb and hitarea handling
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index 6c07db13c1..de6a6976e5 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.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$
- *
  */
 
 // Video script opcodes for Simon1/Simon2
diff --git a/engines/agos/vga.h b/engines/agos/vga.h
index 2a2056ca7b..5a5764532e 100644
--- a/engines/agos/vga.h
+++ b/engines/agos/vga.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 AGOS_VGA_H
diff --git a/engines/agos/vga_e2.cpp b/engines/agos/vga_e2.cpp
index 9e163ba91f..1bde6945f0 100644
--- a/engines/agos/vga_e2.cpp
+++ b/engines/agos/vga_e2.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$
- *
  */
 
 // Video script opcodes for Simon1/Simon2
diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp
index 14a1c60ae5..c8c9673506 100644
--- a/engines/agos/vga_ff.cpp
+++ b/engines/agos/vga_ff.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$
- *
  */
 
 
diff --git a/engines/agos/vga_pn.cpp b/engines/agos/vga_pn.cpp
index d249259ba6..3bd5400504 100644
--- a/engines/agos/vga_pn.cpp
+++ b/engines/agos/vga_pn.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 "agos/agos.h"
diff --git a/engines/agos/vga_s1.cpp b/engines/agos/vga_s1.cpp
index a2306d3cdb..ef05063fc1 100644
--- a/engines/agos/vga_s1.cpp
+++ b/engines/agos/vga_s1.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$
- *
  */
 
 
diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp
index db3a7c18f3..1021ea8f94 100644
--- a/engines/agos/vga_s2.cpp
+++ b/engines/agos/vga_s2.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$
- *
  */
 
 
diff --git a/engines/agos/vga_ww.cpp b/engines/agos/vga_ww.cpp
index 08b2cee303..c74f0cf52b 100644
--- a/engines/agos/vga_ww.cpp
+++ b/engines/agos/vga_ww.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$
- *
  */
 
 // Video script opcodes for Simon1/Simon2
diff --git a/engines/agos/window.cpp b/engines/agos/window.cpp
index 08680c9e45..c55e3dcdda 100644
--- a/engines/agos/window.cpp
+++ b/engines/agos/window.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$
- *
  */
 
 
diff --git a/engines/agos/zones.cpp b/engines/agos/zones.cpp
index d44192d4d2..61efbcb89a 100644
--- a/engines/agos/zones.cpp
+++ b/engines/agos/zones.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$
- *
  */