Merge remote branch 'upstream/master' into pegasus

44 files changed, 5 insertions, 139 deletions

diff --git a/engines/lure/animseq.cpp b/engines/lure/animseq.cpp
index 9c18cb33aa..8037563677 100644
--- a/engines/lure/animseq.cpp
+++ b/engines/lure/animseq.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 "lure/animseq.h"
diff --git a/engines/lure/animseq.h b/engines/lure/animseq.h
index 3609837dba..fde1fab921 100644
--- a/engines/lure/animseq.h
+++ b/engines/lure/animseq.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 LURE_ANIMSEQ_H
diff --git a/engines/lure/debugger.cpp b/engines/lure/debugger.cpp
index fc2029c6c4..9d54bccb49 100644
--- a/engines/lure/debugger.cpp
+++ b/engines/lure/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 "common/config-manager.h"
diff --git a/engines/lure/debugger.h b/engines/lure/debugger.h
index dd1d8b5fc6..a4d4d689c4 100644
--- a/engines/lure/debugger.h
+++ b/engines/lure/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 LURE_DEBUGGER_H
diff --git a/engines/lure/decode.cpp b/engines/lure/decode.cpp
index 5ffdcf1884..3e139a10d6 100644
--- a/engines/lure/decode.cpp
+++ b/engines/lure/decode.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 "lure/decode.h"
diff --git a/engines/lure/decode.h b/engines/lure/decode.h
index 9cc594df64..93f617af7e 100644
--- a/engines/lure/decode.h
+++ b/engines/lure/decode.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 LURE_DECODE_H
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index dd2a702e2a..a69300ee2f 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/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"
@@ -208,7 +205,7 @@ public:
 	LureMetaEngine() : AdvancedMetaEngine(detectionParams) {}
 
 	virtual const char *getName() const {
-		return "Lure of the Temptress Engine";
+		return "Lure of the Temptress";
 	}
 
 	virtual const char *getOriginalCopyright() const {
diff --git a/engines/lure/disk.cpp b/engines/lure/disk.cpp
index f1838e3d67..9212508be0 100644
--- a/engines/lure/disk.cpp
+++ b/engines/lure/disk.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/lure/disk.h b/engines/lure/disk.h
index 79aaf80bbc..1872fbd055 100644
--- a/engines/lure/disk.h
+++ b/engines/lure/disk.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 LURE_DISK_H
diff --git a/engines/lure/events.cpp b/engines/lure/events.cpp
index f56a57ca34..fe60b56658 100644
--- a/engines/lure/events.cpp
+++ b/engines/lure/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$
- *
  */
 
 
diff --git a/engines/lure/events.h b/engines/lure/events.h
index f04072aa0f..dd3f82fe19 100644
--- a/engines/lure/events.h
+++ b/engines/lure/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$
- *
  */
 
 #ifndef LURE_EVENTS_H
diff --git a/engines/lure/fights.cpp b/engines/lure/fights.cpp
index 983033281a..ab5d992bdb 100644
--- a/engines/lure/fights.cpp
+++ b/engines/lure/fights.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 "lure/fights.h"
diff --git a/engines/lure/fights.h b/engines/lure/fights.h
index 0aa44030d2..89f49d8c6d 100644
--- a/engines/lure/fights.h
+++ b/engines/lure/fights.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 LURE_FIGHT_H
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp
index 7e13cff032..9542c35785 100644
--- a/engines/lure/game.cpp
+++ b/engines/lure/game.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 "lure/game.h"
diff --git a/engines/lure/game.h b/engines/lure/game.h
index 123ac0dca7..42818e404b 100644
--- a/engines/lure/game.h
+++ b/engines/lure/game.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 LURE_GAME_H
diff --git a/engines/lure/hotspots.cpp b/engines/lure/hotspots.cpp
index 5644ef798c..97fbaa72ae 100644
--- a/engines/lure/hotspots.cpp
+++ b/engines/lure/hotspots.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 "lure/hotspots.h"
diff --git a/engines/lure/hotspots.h b/engines/lure/hotspots.h
index e9f5d56edd..a58a34456e 100644
--- a/engines/lure/hotspots.h
+++ b/engines/lure/hotspots.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 LURE_HOTSPOTS_H
diff --git a/engines/lure/intro.cpp b/engines/lure/intro.cpp
index e054408a49..ce330be7c4 100644
--- a/engines/lure/intro.cpp
+++ b/engines/lure/intro.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 "lure/lure.h"
diff --git a/engines/lure/intro.h b/engines/lure/intro.h
index f4713c562a..ad442f1564 100644
--- a/engines/lure/intro.h
+++ b/engines/lure/intro.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 LURE_INTRO_H
diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp
index b0968c1956..c6be5c48fe 100644
--- a/engines/lure/lure.cpp
+++ b/engines/lure/lure.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/config-manager.h"
 #include "common/debug-channels.h"
 #include "common/system.h"
 #include "common/savefile.h"
-#include "common/EventRecorder.h"
 
 #include "engines/util.h"
 
@@ -42,8 +38,8 @@ namespace Lure {
 
 static LureEngine *int_engine = NULL;
 
-LureEngine::LureEngine(OSystem *system, const LureGameDescription *gameDesc): Engine(system), _gameDescription(gameDesc) {
-	g_eventRec.registerRandomSource(_rnd, "lure");
+LureEngine::LureEngine(OSystem *system, const LureGameDescription *gameDesc)
+	: Engine(system), _gameDescription(gameDesc), _rnd("lure") {
 
 	DebugMan.addDebugChannel(kLureDebugScripts, "scripts", "Scripts debugging");
 	DebugMan.addDebugChannel(kLureDebugAnimations, "animations", "Animations debugging");
diff --git a/engines/lure/lure.h b/engines/lure/lure.h
index 52b785a09a..53fdb8c713 100644
--- a/engines/lure/lure.h
+++ b/engines/lure/lure.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 LURE_H
diff --git a/engines/lure/luredefs.h b/engines/lure/luredefs.h
index 0ef7a73b7e..91fb650af3 100644
--- a/engines/lure/luredefs.h
+++ b/engines/lure/luredefs.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 LUREDEFS_H
diff --git a/engines/lure/memory.cpp b/engines/lure/memory.cpp
index d3d5067cce..c5c28fa8bc 100644
--- a/engines/lure/memory.cpp
+++ b/engines/lure/memory.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 "lure/memory.h"
diff --git a/engines/lure/memory.h b/engines/lure/memory.h
index f51c4fc49e..05bf23a9ab 100644
--- a/engines/lure/memory.h
+++ b/engines/lure/memory.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 LURE_MEMORY_H
diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp
index f9a78d8fc8..9919471c76 100644
--- a/engines/lure/menu.cpp
+++ b/engines/lure/menu.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 "lure/menu.h"
diff --git a/engines/lure/menu.h b/engines/lure/menu.h
index fcc6308375..b3016f0560 100644
--- a/engines/lure/menu.h
+++ b/engines/lure/menu.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 LURE_MENU_H
diff --git a/engines/lure/palette.cpp b/engines/lure/palette.cpp
index b08ca64dfb..3975561749 100644
--- a/engines/lure/palette.cpp
+++ b/engines/lure/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$
- *
  */
 
 #include "lure/lure.h"
diff --git a/engines/lure/palette.h b/engines/lure/palette.h
index 9420079346..2af1f55973 100644
--- a/engines/lure/palette.h
+++ b/engines/lure/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$
- *
  */
 
 #ifndef LURE_PALETTE_H
diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp
index 01b0bd0d4a..31c4efa2aa 100644
--- a/engines/lure/res.cpp
+++ b/engines/lure/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$
- *
  */
 
 #include "lure/res.h"
diff --git a/engines/lure/res.h b/engines/lure/res.h
index cd6fcde201..a0a908f53d 100644
--- a/engines/lure/res.h
+++ b/engines/lure/res.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 LURE_RES_H
@@ -117,7 +114,7 @@ public:
 	MemoryBlock *messagesData() { return _messagesData; }
 	uint16 getHotspotScript(uint16 index);
 	HotspotList &activeHotspots() { return _activeHotspots; }
-	uint16 random() { return _rnd.getRandomNumber(65536) & 0xffff; }
+	uint16 getRandom() { return _rnd.getRandomNumber(0xffff); }
 	HotspotData *getHotspot(uint16 hotspotId);
 	Hotspot *getActiveHotspot(uint16 hotspotId);
 	HotspotOverrideData *getHotspotOverride(uint16 hotspotId);
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 39beb2729e..0d9d75b00b 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.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 "lure/disk.h"
diff --git a/engines/lure/res_struct.h b/engines/lure/res_struct.h
index 58ee3f4c02..49b6ef78ba 100644
--- a/engines/lure/res_struct.h
+++ b/engines/lure/res_struct.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 LURE_RESSTRUCT_H
diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp
index 4cefe1fabb..2cb871d73f 100644
--- a/engines/lure/room.cpp
+++ b/engines/lure/room.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 "lure/room.h"
diff --git a/engines/lure/room.h b/engines/lure/room.h
index f24136ac42..deafa28a66 100644
--- a/engines/lure/room.h
+++ b/engines/lure/room.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 LURE_ROOM_H
diff --git a/engines/lure/screen.cpp b/engines/lure/screen.cpp
index e02f492ef2..4eb6fd46a3 100644
--- a/engines/lure/screen.cpp
+++ b/engines/lure/screen.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 "lure/screen.h"
diff --git a/engines/lure/screen.h b/engines/lure/screen.h
index 94bbab932e..2a2fa6b2f2 100644
--- a/engines/lure/screen.h
+++ b/engines/lure/screen.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 LURE_SCREEN_H
diff --git a/engines/lure/scripts.cpp b/engines/lure/scripts.cpp
index 20cbd328ce..22656dd3fe 100644
--- a/engines/lure/scripts.cpp
+++ b/engines/lure/scripts.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 "lure/animseq.h"
@@ -34,7 +31,6 @@
 #include "lure/sound.h"
 #include "common/stack.h"
 #include "common/endian.h"
-#include "common/EventRecorder.h"
 
 namespace Lure {
 
@@ -1131,7 +1127,7 @@ uint16 Script::execute(uint16 startOffset) {
 			break;
 
 		case S_OPCODE_RANDOM:
-			param = r.random() >> 8; // make number between 0 to 255
+			param = r.getRandom() >> 8; // make number between 0 to 255
 			break;
 
 		case S_OPCODE_END:
diff --git a/engines/lure/scripts.h b/engines/lure/scripts.h
index b5b6140872..7bc8f8c950 100644
--- a/engines/lure/scripts.h
+++ b/engines/lure/scripts.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 LURE_SCRIPTS_H
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp
index da9e136ec3..cf28e0bb74 100644
--- a/engines/lure/sound.cpp
+++ b/engines/lure/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 "lure/sound.h"
diff --git a/engines/lure/sound.h b/engines/lure/sound.h
index 7a894d814d..58b4a68966 100644
--- a/engines/lure/sound.h
+++ b/engines/lure/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 LURE_SOUND_H
diff --git a/engines/lure/strings.cpp b/engines/lure/strings.cpp
index 7c3f358080..0c9f4b5352 100644
--- a/engines/lure/strings.cpp
+++ b/engines/lure/strings.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 "lure/strings.h"
diff --git a/engines/lure/strings.h b/engines/lure/strings.h
index 8dbca70813..e32921ddb6 100644
--- a/engines/lure/strings.h
+++ b/engines/lure/strings.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 LURE_STRINGS_H
diff --git a/engines/lure/surface.cpp b/engines/lure/surface.cpp
index 783401fde2..106b62b7a4 100644
--- a/engines/lure/surface.cpp
+++ b/engines/lure/surface.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 "lure/decode.h"
diff --git a/engines/lure/surface.h b/engines/lure/surface.h
index 9a677cf749..56af37c049 100644
--- a/engines/lure/surface.h
+++ b/engines/lure/surface.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 LURE_SURFACE_H