From 56143c4c731d29af92475d7480f11958710bae51 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Sat, 17 Mar 2007 13:20:39 +0000
Subject: recent changes to projects

svn-id: r26167
---
 dists/codeblocks/agos.layout         |  13 +-
 dists/codeblocks/cine.depend         | 376 ++++++++++++++++++++++++++++++++
 dists/codeblocks/gob.layout          |   6 +
 dists/codeblocks/kyra.layout         |  14 +-
 dists/codeblocks/lure.layout         |   3 +
 dists/codeblocks/parallaction.cbp    |   6 +
 dists/codeblocks/parallaction.depend | 409 +++++++++++++++++++++++++++++++++++
 dists/codeblocks/parallaction.layout | 107 ++++-----
 dists/codeblocks/queen.layout        |  17 +-
 dists/codeblocks/saga.layout         |  16 +-
 dists/codeblocks/scumm.layout        |  12 +-
 dists/codeblocks/scummvm.cbp         |  42 ++--
 dists/codeblocks/scummvm.depend      | 127 ++++++-----
 dists/codeblocks/scummvm.layout      |  82 ++++---
 dists/codeblocks/scummvm.workspace   |  26 ---
 15 files changed, 1057 insertions(+), 199 deletions(-)

(limited to 'dists')

diff --git a/dists/codeblocks/agos.layout b/dists/codeblocks/agos.layout
index 72ae253435..40826d1e7a 100644
--- a/dists/codeblocks/agos.layout
+++ b/dists/codeblocks/agos.layout
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="default" />
-	<File name="..\..\engines\agos\agos.cpp" open="1" top="0" tabpos="1">
-		<Cursor position="1020" topLine="2" />
+	<File name="..\..\engines\agos\agos.cpp" open="0" top="0" tabpos="1">
+		<Cursor position="1020" topLine="134" />
+	</File>
+	<File name="..\..\engines\agos\res.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="15084" topLine="474" />
+	</File>
+	<File name="..\..\engines\agos\script_e1.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="19083" topLine="737" />
+	</File>
+	<File name="..\..\engines\agos\script_s2.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="5992" topLine="180" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/cine.depend b/dists/codeblocks/cine.depend
index c4ac3106ea..9a29b22ab1 100644
--- a/dists/codeblocks/cine.depend
+++ b/dists/codeblocks/cine.depend
@@ -1 +1,377 @@
 # depslib dependency file v1.0
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\anim.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"common/stream.h"
+	"cine/cine.h"
+	"cine/anim.h"
+	"cine/gfx.h"
+	"cine/pal.h"
+	"cine/part.h"
+	"cine/various.h"
+
+1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stdafx.h
+	<portdefs.h>
+	<strings.h>
+	<stdio.h>
+	<stdlib.h>
+	<string.h>
+	<stdarg.h>
+	<assert.h>
+	<ctype.h>
+	<time.h>
+	<math.h>
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\endian.h
+	"common/scummsys.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\scummsys.h
+	"config.h"
+	<SDL_byteorder.h>
+	"palmversion.h"
+	"globals.h"
+	"extend.h"
+	"nds/jtypes.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\cine.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/util.h"
+	"engines/engine.h"
+	"cine/texte.h"
+	"cine/rel.h"
+	"cine/script.h"
+	"cine/part.h"
+	"cine/prc.h"
+	"cine/resource.h"
+	"cine/msg.h"
+	"cine/bg.h"
+	"cine/pal.h"
+	"cine/gfx.h"
+	"cine/anim.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.h
+	"common/scummsys.h"
+	"common/str.h"
+	"common/array.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.h
+	"common/scummsys.h"
+	"common/array.h"
+
+1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\array.h
+	"common/scummsys.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/str.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\texte.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\rel.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\script.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\part.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\prc.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\resource.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\msg.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\bg.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\pal.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\gfx.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\anim.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\various.h
+	"common/stdafx.h"
+	"common/file.h"
+	"cine/cine.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/str.h"
+	"common/stream.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\bg.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"common/stream.h"
+	"cine/cine.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\bg_list.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"common/stream.h"
+	"cine/cine.h"
+	"cine/main_loop.h"
+	"cine/object.h"
+	"cine/various.h"
+	"cine/bg_list.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\main_loop.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\object.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\bg_list.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/savefile.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\savefile.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/stream.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\cine.cpp
+	"common/stdafx.h"
+	"common/file.h"
+	"common/fs.h"
+	"common/savefile.h"
+	"common/config-manager.h"
+	"common/system.h"
+	"graphics/cursorman.h"
+	"sound/mididrv.h"
+	"sound/mixer.h"
+	"cine/cine.h"
+	"cine/bg_list.h"
+	"cine/main_loop.h"
+	"cine/object.h"
+	"cine/texte.h"
+	"cine/sfx_player.h"
+	"cine/sound_driver.h"
+	"cine/various.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.h
+	"common/array.h"
+	"common/str.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-manager.h
+	"common/array.h"
+	"common/hashmap.h"
+	"common/singleton.h"
+	"common/str.h"
+	"common/hash-str.h"
+
+1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.h
+	"common/stdafx.h"
+	"common/func.h"
+	"common/str.h"
+	"common/util.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\func.h
+	"common/scummsys.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\singleton.h
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hash-str.h
+	"common/hashmap.h"
+	"common/str.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.h
+	"common/scummsys.h"
+	"common/mutex.h"
+	"common/rect.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.h
+	"common/scummsys.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\rect.h
+	"common/scummsys.h"
+	"common/util.h"
+
+1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\cursorman.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/stack.h"
+	"common/singleton.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stack.h
+	"common/scummsys.h"
+	"common/array.h"
+
+1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mididrv.h
+	"common/scummsys.h"
+	"common/timer.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\timer.h
+	"common/scummsys.h"
+
+1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/mutex.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\sfx_player.h
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\sound_driver.h
+	"sound/audiostream.h"
+	"sound/fmopl.h"
+	"sound/mixer.h"
+
+1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\audiostream.h
+	"common/stdafx.h"
+	"common/util.h"
+	"common/scummsys.h"
+
+1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\fmopl.h
+	"common/scummsys.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\detection.cpp
+	"common/stdafx.h"
+	"base/plugins.h"
+	"common/advancedDetector.h"
+	"cine/cine.h"
+
+1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.h
+	"common/stdafx.h"
+	"common/array.h"
+	"common/list.h"
+	"common/singleton.h"
+	"common/util.h"
+	"base/game.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\list.h
+	"common/scummsys.h"
+
+1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.h
+	"common/stdafx.h"
+	"common/str.h"
+	"common/array.h"
+	"common/hash-str.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\advanceddetector.h
+	"common/fs.h"
+	"base/game.h"
+	"base/plugins.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\gfx.cpp
+	"cine/cine.h"
+	"cine/various.h"
+	"common/system.h"
+	"graphics/cursorman.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\main_loop.cpp
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/system.h"
+	"cine/main_loop.h"
+	"cine/object.h"
+	"cine/sfx_player.h"
+	"cine/various.h"
+	"cine/bg_list.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\msg.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"cine/msg.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\object.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"common/scummsys.h"
+	"common/util.h"
+	"cine/cine.h"
+	"cine/object.h"
+	"cine/part.h"
+	"cine/resource.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\pal.cpp
+	"cine/cine.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\part.cpp
+	"cine/cine.h"
+	"cine/unpack.h"
+	"cine/various.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\unpack.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\prc.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"cine/cine.h"
+	"cine/various.h"
+	"common/config-manager.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\rel.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"cine/cine.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\resource.cpp
+	"common/file.h"
+	"cine/cine.h"
+	"cine/resource.h"
+	"cine/unpack.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\script.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"cine/cine.h"
+	"cine/bg_list.h"
+	"cine/object.h"
+	"cine/sfx_player.h"
+	"cine/sound_driver.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\sfx_player.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"common/system.h"
+	"cine/cine.h"
+	"cine/sfx_player.h"
+	"cine/sound_driver.h"
+	"cine/unpack.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\sound_driver.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"cine/cine.h"
+	"cine/sound_driver.h"
+	"sound/mixer.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\texte.cpp
+	"cine/cine.h"
+	"common/file.h"
+	"cine/various.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\unpack.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"cine/unpack.h"
+
+1173398879 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\cine\various.cpp
+	"common/stdafx.h"
+	"common/endian.h"
+	"common/savefile.h"
+	"cine/cine.h"
+	"cine/main_loop.h"
+	"cine/object.h"
+	"cine/sfx_player.h"
+	"cine/bg_list.h"
+	"cine/various.h"
+
diff --git a/dists/codeblocks/gob.layout b/dists/codeblocks/gob.layout
index a126bf3402..7171ccec5a 100644
--- a/dists/codeblocks/gob.layout
+++ b/dists/codeblocks/gob.layout
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="" />
+	<File name="..\..\engines\gob\detection.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="7253" topLine="310" />
+	</File>
+	<File name="..\..\engines\gob\global.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1570" topLine="29" />
+	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/kyra.layout b/dists/codeblocks/kyra.layout
index 31bcc06eaa..af16841a5d 100644
--- a/dists/codeblocks/kyra.layout
+++ b/dists/codeblocks/kyra.layout
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="" />
-	<File name="..\..\engines\kyra\animator.cpp" open="1" top="0" tabpos="1">
+	<File name="..\..\engines\kyra\animator.cpp" open="0" top="0" tabpos="1">
 		<Cursor position="1008" topLine="0" />
 	</File>
-	<File name="..\..\engines\kyra\resource.cpp" open="1" top="0" tabpos="3">
+	<File name="..\..\engines\kyra\kyra3.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="16716" topLine="639" />
+	</File>
+	<File name="..\..\engines\kyra\resource.cpp" open="0" top="0" tabpos="3">
 		<Cursor position="1723" topLine="45" />
 	</File>
-	<File name="..\..\engines\kyra\resource.h" open="1" top="0" tabpos="4">
+	<File name="..\..\engines\kyra\resource.h" open="0" top="0" tabpos="4">
 		<Cursor position="3191" topLine="87" />
 	</File>
-	<File name="..\..\engines\kyra\staticres.cpp" open="1" top="0" tabpos="2">
+	<File name="..\..\engines\kyra\seqplayer.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="8220" topLine="276" />
+	</File>
+	<File name="..\..\engines\kyra\staticres.cpp" open="0" top="0" tabpos="2">
 		<Cursor position="0" topLine="0" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/lure.layout b/dists/codeblocks/lure.layout
index a126bf3402..ccd3d24185 100644
--- a/dists/codeblocks/lure.layout
+++ b/dists/codeblocks/lure.layout
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="" />
+	<File name="..\..\engines\lure\res_struct.h" open="0" top="0" tabpos="0">
+		<Cursor position="9288" topLine="408" />
+	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/parallaction.cbp b/dists/codeblocks/parallaction.cbp
index 9893dbe475..875460da59 100644
--- a/dists/codeblocks/parallaction.cbp
+++ b/dists/codeblocks/parallaction.cbp
@@ -167,6 +167,12 @@
 			<Option compilerVar="CPP" />
 			<Option target="default" />
 		</Unit>
+		<Unit filename="..\..\engines\parallaction\walk.h">
+			<Option compilerVar="CPP" />
+			<Option compile="0" />
+			<Option link="0" />
+			<Option target="default" />
+		</Unit>
 		<Unit filename="..\..\engines\parallaction\zone.cpp">
 			<Option compilerVar="CPP" />
 			<Option target="default" />
diff --git a/dists/codeblocks/parallaction.depend b/dists/codeblocks/parallaction.depend
index c4ac3106ea..5fddf3f7c2 100644
--- a/dists/codeblocks/parallaction.depend
+++ b/dists/codeblocks/parallaction.depend
@@ -1 +1,410 @@
 # depslib dependency file v1.0
+1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\animation.cpp
+	"parallaction/disk.h"
+	"parallaction/parallaction.h"
+	"parallaction/graphics.h"
+	"parallaction/music.h"
+	"parallaction/parser.h"
+	"parallaction/zone.h"
+
+1173995808 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\disk.h
+	"parallaction/defs.h"
+	"common/file.h"
+
+1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\defs.h
+	"common/stdafx.h"
+	"common/system.h"
+
+1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stdafx.h
+	<portdefs.h>
+	<strings.h>
+	<stdio.h>
+	<stdlib.h>
+	<string.h>
+	<stdarg.h>
+	<assert.h>
+	<ctype.h>
+	<time.h>
+	<math.h>
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.h
+	"common/scummsys.h"
+	"common/mutex.h"
+	"common/noncopyable.h"
+	"common/rect.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\scummsys.h
+	"config.h"
+	<SDL_byteorder.h>
+	"palmversion.h"
+	"globals.h"
+	"extend.h"
+	"nds/jtypes.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.h
+	"common/scummsys.h"
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\noncopyable.h
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\rect.h
+	"common/scummsys.h"
+	"common/util.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.h
+	"common/scummsys.h"
+	"common/str.h"
+	"common/array.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.h
+	"common/scummsys.h"
+	"common/array.h"
+
+1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\array.h
+	"common/scummsys.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/str.h"
+	"common/stream.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+
+1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parallaction.h
+	"engines/engine.h"
+	"parallaction/defs.h"
+	"parallaction/inventory.h"
+	"parallaction/parser.h"
+	"parallaction/disk.h"
+	"parallaction/zone.h"
+	"common/str.h"
+	"gui/dialog.h"
+	"gui/widget.h"
+
+1173398879 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/str.h"
+
+1173731024 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\inventory.h
+
+1173398860 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parser.h
+	"parallaction/defs.h"
+	"common/stream.h"
+
+1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\zone.h
+	"parallaction/defs.h"
+
+1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.h
+	"common/scummsys.h"
+	"common/str.h"
+	"gui/object.h"
+	"gui/widget.h"
+
+1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.h
+
+1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\widget.h
+	"common/scummsys.h"
+	"common/str.h"
+	"graphics/font.h"
+	"graphics/surface.h"
+	"gui/object.h"
+
+1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\font.h
+	"common/str.h"
+	"graphics/surface.h"
+
+1173398896 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\surface.h
+	"common/scummsys.h"
+	"common/rect.h"
+
+1174077965 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\graphics.h
+	"parallaction/defs.h"
+	"common/stream.h"
+	"common/pack-start.h"
+	"common/pack-end.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-start.h
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\pack-end.h
+
+1173398860 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\music.h
+	"common/util.h"
+	"common/mutex.h"
+	"sound/mididrv.h"
+
+1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mididrv.h
+	"common/scummsys.h"
+	"common/timer.h"
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\timer.h
+	"common/scummsys.h"
+	"common/noncopyable.h"
+
+1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\archive.cpp
+	"common/file.h"
+	"parallaction/disk.h"
+
+1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\callables.cpp
+	"parallaction/disk.h"
+	"parallaction/parallaction.h"
+	"parallaction/graphics.h"
+	"parallaction/inventory.h"
+	"parallaction/menu.h"
+	"parallaction/music.h"
+	"parallaction/zone.h"
+	"common/file.h"
+
+1173626357 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\menu.h
+	"parallaction/defs.h"
+
+1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\debug.cpp
+	"common/stdafx.h"
+	"common/system.h"
+	"parallaction/parallaction.h"
+	"parallaction/graphics.h"
+
+1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\detection.cpp
+	"common/stdafx.h"
+	"base/plugins.h"
+	"common/advancedDetector.h"
+	"parallaction/parallaction.h"
+
+1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.h
+	"common/stdafx.h"
+	"common/array.h"
+	"common/list.h"
+	"common/singleton.h"
+	"common/util.h"
+	"base/game.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\list.h
+	"common/scummsys.h"
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\singleton.h
+	"common/noncopyable.h"
+
+1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.h
+	"common/stdafx.h"
+	"common/str.h"
+	"common/array.h"
+	"common/hash-str.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hash-str.h
+	"common/hashmap.h"
+	"common/str.h"
+
+1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.h
+	"common/stdafx.h"
+	"common/func.h"
+	"common/str.h"
+	"common/util.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\func.h
+	"common/scummsys.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\advanceddetector.h
+	"common/fs.h"
+	"base/game.h"
+	"base/plugins.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.h
+	"common/array.h"
+	"common/str.h"
+
+1174136052 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\dialogue.cpp
+	"parallaction/commands.h"
+	"parallaction/parallaction.h"
+	"parallaction/graphics.h"
+	"parallaction/disk.h"
+	"parallaction/inventory.h"
+	"parallaction/parser.h"
+	"parallaction/zone.h"
+	"common/events.h"
+
+1174137600 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\commands.h
+	"parallaction/defs.h"
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\events.h
+	"common/rect.h"
+	"common/system.h"
+	"common/noncopyable.h"
+
+1173995808 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\disk.cpp
+	"parallaction/defs.h"
+	"parallaction/graphics.h"
+	"parallaction/parallaction.h"
+	"parallaction/disk.h"
+	"parallaction/walk.h"
+
+1173740074 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\walk.h
+	"parallaction/defs.h"
+
+1174136052 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\graphics.cpp
+	"common/file.h"
+	"parallaction/graphics.h"
+	"parallaction/parser.h"
+	"parallaction/parallaction.h"
+	"parallaction/disk.h"
+	"parallaction/zone.h"
+
+1173909457 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\intro.cpp
+	"parallaction/parallaction.h"
+	"parallaction/menu.h"
+	"parallaction/music.h"
+	"parallaction/graphics.h"
+	"parallaction/zone.h"
+
+1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\inventory.cpp
+	"parallaction/parallaction.h"
+	"parallaction/disk.h"
+	"parallaction/zone.h"
+	"parallaction/graphics.h"
+	"parallaction/inventory.h"
+
+1173995808 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\menu.cpp
+	"parallaction/menu.h"
+	"parallaction/disk.h"
+	"parallaction/music.h"
+	"parallaction/graphics.h"
+	"parallaction/parallaction.h"
+
+1173647915 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\music.cpp
+	"common/stdafx.h"
+	"common/file.h"
+	"parallaction/parallaction.h"
+	"common/stream.h"
+	"sound/midiparser.h"
+	"parallaction/music.h"
+
+1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\midiparser.h
+	"common/scummsys.h"
+	"common/endian.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\endian.h
+	"common/scummsys.h"
+
+1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parallaction.cpp
+	"common/stdafx.h"
+	"common/config-manager.h"
+	"common/events.h"
+	"common/file.h"
+	"common/util.h"
+	"sound/mididrv.h"
+	"sound/mixer.h"
+	"parallaction/parallaction.h"
+	"parallaction/menu.h"
+	"parallaction/parser.h"
+	"parallaction/disk.h"
+	"parallaction/music.h"
+	"parallaction/inventory.h"
+	"parallaction/graphics.h"
+	"parallaction/walk.h"
+	"parallaction/zone.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-manager.h
+	"common/array.h"
+	"common/hashmap.h"
+	"common/singleton.h"
+	"common/str.h"
+	"common/hash-str.h"
+
+1173398891 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/mutex.h"
+
+1173398860 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\parser.cpp
+	"parallaction/defs.h"
+	"parallaction/parser.h"
+	"parallaction/parallaction.h"
+	"parallaction/disk.h"
+
+1174118148 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\saveload.cpp
+	"parallaction/parallaction.h"
+	"parallaction/disk.h"
+	"parallaction/graphics.h"
+	"parallaction/zone.h"
+	"common/savefile.h"
+	"gui/widget.h"
+	"gui/ListWidget.h"
+	"gui/message.h"
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\savefile.h
+	"common/stdafx.h"
+	"common/noncopyable.h"
+	"common/scummsys.h"
+	"common/stream.h"
+
+1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\listwidget.h
+	"gui/editable.h"
+	"common/str.h"
+
+1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\editable.h
+	"common/str.h"
+	"common/rect.h"
+	"gui/widget.h"
+	"gui/newgui.h"
+
+1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.h
+	"common/scummsys.h"
+	"common/singleton.h"
+	"common/stack.h"
+	"common/str.h"
+	"graphics/fontman.h"
+	"gui/theme.h"
+	"gui/widget.h"
+
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stack.h
+	"common/scummsys.h"
+	"common/array.h"
+
+1173398895 c:\documents and settings\usoquotidiano\desktop\scummvm\graphics\fontman.h
+	"common/stdafx.h"
+	"common/scummsys.h"
+	"common/singleton.h"
+	"common/str.h"
+	"common/hashmap.h"
+	"common/hash-str.h"
+	"graphics/font.h"
+
+1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.h
+	"common/stdafx.h"
+	"common/system.h"
+	"common/rect.h"
+	"common/str.h"
+	"common/file.h"
+	"common/config-file.h"
+	"graphics/surface.h"
+	"graphics/fontman.h"
+
+1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\config-file.h
+	"common/config-manager.h"
+	"common/list.h"
+	"common/str.h"
+	"common/stream.h"
+
+1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\message.h
+	"gui/dialog.h"
+	"common/str.h"
+
+1173732116 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\staticres.cpp
+	"parallaction/graphics.h"
+
+1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\walk.cpp
+	"parallaction/defs.h"
+	"parallaction/parallaction.h"
+	"parallaction/commands.h"
+	"parallaction/graphics.h"
+	"parallaction/walk.h"
+	"parallaction/zone.h"
+
+1174137321 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\parallaction\zone.cpp
+	"parallaction/parser.h"
+	"parallaction/parallaction.h"
+	"parallaction/graphics.h"
+	"parallaction/inventory.h"
+	"parallaction/zone.h"
+
diff --git a/dists/codeblocks/parallaction.layout b/dists/codeblocks/parallaction.layout
index 87bb16d210..835e249700 100644
--- a/dists/codeblocks/parallaction.layout
+++ b/dists/codeblocks/parallaction.layout
@@ -1,77 +1,77 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="default" />
-	<File name="..\..\engines\parallaction\animation.cpp" open="1" top="0" tabpos="16">
-		<Cursor position="17627" topLine="634" />
+	<File name="..\..\engines\parallaction\animation.cpp" open="1" top="0" tabpos="2">
+		<Cursor position="7368" topLine="252" />
 	</File>
-	<File name="..\..\engines\parallaction\archive.cpp" open="1" top="0" tabpos="14">
-		<Cursor position="1227" topLine="79" />
+	<File name="..\..\engines\parallaction\archive.cpp" open="0" top="0" tabpos="14">
+		<Cursor position="1310" topLine="26" />
 	</File>
-	<File name="..\..\engines\parallaction\callables.cpp" open="1" top="0" tabpos="7">
-		<Cursor position="1524" topLine="36" />
+	<File name="..\..\engines\parallaction\callables.cpp" open="1" top="0" tabpos="15">
+		<Cursor position="9374" topLine="303" />
 	</File>
-	<File name="..\..\engines\parallaction\commands.cpp" open="0" top="0" tabpos="3">
-		<Cursor position="6420" topLine="213" />
+	<File name="..\..\engines\parallaction\commands.cpp" open="1" top="0" tabpos="16">
+		<Cursor position="5835" topLine="166" />
 	</File>
-	<File name="..\..\engines\parallaction\commands.h" open="0" top="0" tabpos="19">
-		<Cursor position="1379" topLine="0" />
+	<File name="..\..\engines\parallaction\commands.h" open="1" top="0" tabpos="13">
+		<Cursor position="1490" topLine="35" />
 	</File>
-	<File name="..\..\engines\parallaction\debug.cpp" open="0" top="0" tabpos="22">
-		<Cursor position="1833" topLine="19" />
+	<File name="..\..\engines\parallaction\debug.cpp" open="0" top="0" tabpos="11">
+		<Cursor position="1671" topLine="19" />
 	</File>
-	<File name="..\..\engines\parallaction\defs.h" open="1" top="0" tabpos="5">
-		<Cursor position="1375" topLine="9" />
+	<File name="..\..\engines\parallaction\defs.h" open="1" top="0" tabpos="4">
+		<Cursor position="1241" topLine="29" />
 	</File>
-	<File name="..\..\engines\parallaction\detection.cpp" open="0" top="0" tabpos="23">
+	<File name="..\..\engines\parallaction\detection.cpp" open="0" top="0" tabpos="12">
 		<Cursor position="1049" topLine="7" />
 	</File>
-	<File name="..\..\engines\parallaction\dialogue.cpp" open="1" top="0" tabpos="8">
-		<Cursor position="16545" topLine="627" />
+	<File name="..\..\engines\parallaction\dialogue.cpp" open="1" top="0" tabpos="3">
+		<Cursor position="6759" topLine="211" />
 	</File>
-	<File name="..\..\engines\parallaction\disk.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="3254" topLine="120" />
+	<File name="..\..\engines\parallaction\disk.cpp" open="1" top="0" tabpos="10">
+		<Cursor position="2449" topLine="96" />
 	</File>
-	<File name="..\..\engines\parallaction\disk.h" open="1" top="0" tabpos="4">
-		<Cursor position="3270" topLine="64" />
+	<File name="..\..\engines\parallaction\disk.h" open="0" top="0" tabpos="12">
+		<Cursor position="3242" topLine="73" />
 	</File>
-	<File name="..\..\engines\parallaction\graphics.cpp" open="0" top="0" tabpos="5">
-		<Cursor position="11291" topLine="357" />
+	<File name="..\..\engines\parallaction\graphics.cpp" open="1" top="0" tabpos="5">
+		<Cursor position="19121" topLine="767" />
 	</File>
-	<File name="..\..\engines\parallaction\graphics.h" open="0" top="0" tabpos="14">
-		<Cursor position="2702" topLine="24" />
+	<File name="..\..\engines\parallaction\graphics.h" open="1" top="0" tabpos="12">
+		<Cursor position="4260" topLine="125" />
 	</File>
-	<File name="..\..\engines\parallaction\intro.cpp" open="1" top="0" tabpos="13">
-		<Cursor position="7032" topLine="109" />
+	<File name="..\..\engines\parallaction\intro.cpp" open="0" top="0" tabpos="4">
+		<Cursor position="8671" topLine="158" />
 	</File>
-	<File name="..\..\engines\parallaction\inventory.cpp" open="1" top="0" tabpos="9">
-		<Cursor position="4139" topLine="149" />
+	<File name="..\..\engines\parallaction\inventory.cpp" open="1" top="0" tabpos="6">
+		<Cursor position="3395" topLine="89" />
 	</File>
-	<File name="..\..\engines\parallaction\inventory.h" open="0" top="0" tabpos="7">
-		<Cursor position="1208" topLine="4" />
+	<File name="..\..\engines\parallaction\inventory.h" open="0" top="0" tabpos="9">
+		<Cursor position="1418" topLine="10" />
 	</File>
-	<File name="..\..\engines\parallaction\location.cpp" open="1" top="0" tabpos="1">
-		<Cursor position="10706" topLine="438" />
+	<File name="..\..\engines\parallaction\location.cpp" open="1" top="0" tabpos="11">
+		<Cursor position="0" topLine="0" />
 	</File>
-	<File name="..\..\engines\parallaction\menu.cpp" open="1" top="0" tabpos="2">
-		<Cursor position="9866" topLine="374" />
+	<File name="..\..\engines\parallaction\menu.cpp" open="0" top="0" tabpos="11">
+		<Cursor position="8465" topLine="57" />
 	</File>
 	<File name="..\..\engines\parallaction\menu.h" open="0" top="0" tabpos="2">
-		<Cursor position="1282" topLine="1" />
+		<Cursor position="1282" topLine="7" />
 	</File>
 	<File name="..\..\engines\parallaction\module.mk" open="0" top="0" tabpos="12">
 		<Cursor position="165" topLine="0" />
 	</File>
-	<File name="..\..\engines\parallaction\music.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="2222" topLine="70" />
+	<File name="..\..\engines\parallaction\music.cpp" open="0" top="0" tabpos="15">
+		<Cursor position="2102" topLine="49" />
 	</File>
 	<File name="..\..\engines\parallaction\music.h" open="0" top="0" tabpos="21">
 		<Cursor position="1311" topLine="0" />
 	</File>
-	<File name="..\..\engines\parallaction\parallaction.cpp" open="1" top="0" tabpos="6">
-		<Cursor position="3608" topLine="153" />
+	<File name="..\..\engines\parallaction\parallaction.cpp" open="1" top="0" tabpos="7">
+		<Cursor position="22155" topLine="929" />
 	</File>
-	<File name="..\..\engines\parallaction\parallaction.h" open="1" top="0" tabpos="12">
-		<Cursor position="7115" topLine="277" />
+	<File name="..\..\engines\parallaction\parallaction.h" open="1" top="0" tabpos="14">
+		<Cursor position="2196" topLine="78" />
 	</File>
 	<File name="..\..\engines\parallaction\parser.cpp" open="0" top="0" tabpos="19">
 		<Cursor position="1734" topLine="21" />
@@ -79,19 +79,22 @@
 	<File name="..\..\engines\parallaction\parser.h" open="0" top="0" tabpos="12">
 		<Cursor position="1200" topLine="9" />
 	</File>
-	<File name="..\..\engines\parallaction\saveload.cpp" open="1" top="0" tabpos="10">
-		<Cursor position="4432" topLine="151" />
+	<File name="..\..\engines\parallaction\saveload.cpp" open="0" top="0" tabpos="10">
+		<Cursor position="4740" topLine="129" />
 	</File>
-	<File name="..\..\engines\parallaction\staticres.cpp" open="0" top="0" tabpos="24">
-		<Cursor position="1055" topLine="0" />
+	<File name="..\..\engines\parallaction\staticres.cpp" open="0" top="0" tabpos="1">
+		<Cursor position="1069" topLine="0" />
 	</File>
-	<File name="..\..\engines\parallaction\walk.cpp" open="1" top="0" tabpos="15">
-		<Cursor position="11549" topLine="401" />
+	<File name="..\..\engines\parallaction\walk.cpp" open="1" top="0" tabpos="8">
+		<Cursor position="4566" topLine="154" />
 	</File>
-	<File name="..\..\engines\parallaction\zone.cpp" open="1" top="0" tabpos="11">
-		<Cursor position="12193" topLine="416" />
+	<File name="..\..\engines\parallaction\walk.h" open="0" top="0" tabpos="12">
+		<Cursor position="1105" topLine="0" />
 	</File>
-	<File name="..\..\engines\parallaction\zone.h" open="0" top="0" tabpos="13">
-		<Cursor position="4800" topLine="167" />
+	<File name="..\..\engines\parallaction\zone.cpp" open="1" top="0" tabpos="9">
+		<Cursor position="12421" topLine="420" />
+	</File>
+	<File name="..\..\engines\parallaction\zone.h" open="1" top="1" tabpos="1">
+		<Cursor position="5008" topLine="133" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/queen.layout b/dists/codeblocks/queen.layout
index 09214a048b..d663aa3d7d 100644
--- a/dists/codeblocks/queen.layout
+++ b/dists/codeblocks/queen.layout
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="default" />
-	<File name="..\..\engines\queen\bankman.cpp" open="1" top="0" tabpos="1">
+	<File name="..\..\engines\queen\bankman.cpp" open="0" top="0" tabpos="1">
 		<Cursor position="984" topLine="0" />
 	</File>
-	<File name="..\..\engines\queen\logic.cpp" open="1" top="0" tabpos="3">
-		<Cursor position="1739" topLine="53" />
+	<File name="..\..\engines\queen\input.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1432" topLine="47" />
 	</File>
-	<File name="..\..\engines\queen\sound.cpp" open="1" top="0" tabpos="2">
+	<File name="..\..\engines\queen\input.h" open="0" top="0" tabpos="0">
+		<Cursor position="1341" topLine="24" />
+	</File>
+	<File name="..\..\engines\queen\logic.cpp" open="0" top="0" tabpos="3">
+		<Cursor position="6295" topLine="167" />
+	</File>
+	<File name="..\..\engines\queen\queen.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="10876" topLine="347" />
+	</File>
+	<File name="..\..\engines\queen\sound.cpp" open="0" top="0" tabpos="2">
 		<Cursor position="13215" topLine="558" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/saga.layout b/dists/codeblocks/saga.layout
index 1ee4aed8f1..0336f0e3a1 100644
--- a/dists/codeblocks/saga.layout
+++ b/dists/codeblocks/saga.layout
@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="" />
-	<File name="..\..\engines\saga\rscfile.h" open="1" top="0" tabpos="2">
+	<File name="..\..\engines\saga\gfx.h" open="0" top="0" tabpos="1">
+		<Cursor position="2577" topLine="87" />
+	</File>
+	<File name="..\..\engines\saga\music.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="90" />
+	</File>
+	<File name="..\..\engines\saga\palanim.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="10" />
+	</File>
+	<File name="..\..\engines\saga\rscfile.h" open="0" top="0" tabpos="2">
 		<Cursor position="1398" topLine="19" />
 	</File>
-	<File name="..\..\engines\saga\sagagame.h" open="1" top="0" tabpos="1">
+	<File name="..\..\engines\saga\sagagame.h" open="0" top="0" tabpos="1">
 		<Cursor position="4649" topLine="204" />
 	</File>
+	<File name="..\..\engines\saga\scene.h" open="0" top="0" tabpos="0">
+		<Cursor position="1262" topLine="72" />
+	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/scumm.layout b/dists/codeblocks/scumm.layout
index be1c7f69bb..14abc9a51a 100644
--- a/dists/codeblocks/scumm.layout
+++ b/dists/codeblocks/scumm.layout
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="" />
-	<File name="..\..\engines\scumm\gfx.cpp" open="1" top="0" tabpos="2">
+	<File name="..\..\engines\scumm\gfx.cpp" open="0" top="0" tabpos="2">
 		<Cursor position="27430" topLine="955" />
 	</File>
-	<File name="..\..\engines\scumm\he\logic_he.cpp" open="1" top="1" tabpos="5">
-		<Cursor position="0" topLine="0" />
+	<File name="..\..\engines\scumm\he\logic_he.cpp" open="0" top="0" tabpos="5">
+		<Cursor position="1167" topLine="0" />
 	</File>
-	<File name="..\..\engines\scumm\he\resource_he.cpp" open="1" top="0" tabpos="1">
+	<File name="..\..\engines\scumm\he\resource_he.cpp" open="0" top="0" tabpos="1">
 		<Cursor position="22484" topLine="687" />
 	</File>
-	<File name="..\..\engines\scumm\he\resource_he.h" open="1" top="0" tabpos="4">
+	<File name="..\..\engines\scumm\he\resource_he.h" open="0" top="0" tabpos="4">
 		<Cursor position="3416" topLine="78" />
 	</File>
-	<File name="..\..\engines\scumm\resource.h" open="1" top="0" tabpos="3">
+	<File name="..\..\engines\scumm\resource.h" open="0" top="0" tabpos="3">
 		<Cursor position="1173" topLine="0" />
 	</File>
 </CodeBlocks_layout_file>
diff --git a/dists/codeblocks/scummvm.cbp b/dists/codeblocks/scummvm.cbp
index 2793d7c6b7..4dfd874890 100644
--- a/dists/codeblocks/scummvm.cbp
+++ b/dists/codeblocks/scummvm.cbp
@@ -11,7 +11,7 @@
 			<Target title="default">
 				<Option output="scummvm\scummvm.exe" prefix_auto="1" extension_auto="1" />
 				<Option object_output="scummvm" />
-				<Option external_deps="scummvm\engines\parallaction\libparallaction.a;scummvm\engines\queen\libqueen.a;scummvm\engines\agi\libagi.a;scummvm\engines\agos\libagos.a;scummvm\engines\saga\libsaga.a;scummvm\engines\lure\liblure.a;scummvm\engines\kyra\libkyra.a;" />
+				<Option external_deps="scummvm\engines\parallaction\libparallaction.a;scummvm\engines\agi\libagi.a;scummvm\engines\agos\libagos.a;scummvm\engines\saga\libsaga.a;scummvm\engines\lure\liblure.a;scummvm\engines\kyra\libkyra.a;" />
 				<Option type="1" />
 				<Option compiler="gcc" />
 				<Option parameters="-d 9 --debugflags=location,disk,jobs,dialogue" />
@@ -25,6 +25,19 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="-Wno-multichar" />
+			<Add option="-DDISABLE_GOB" />
+			<Add option="-DDISABLE_CINE" />
+			<Add option="-DDISABLE_LURE" />
+			<Add option="-DDISABLE_SKY" />
+			<Add option="-DDISABLE_SCUMM" />
+			<Add option="-DDISABLE_KYRA" />
+			<Add option="-DDISABLE_TOUCHE" />
+			<Add option="-DDISABLE_AGI" />
+			<Add option="-DDISABLE_AGOS" />
+			<Add option="-DDISABLE_QUEEN" />
+			<Add option="-DDISABLE_SWORD1" />
+			<Add option="-DDISABLE_SWORD2" />
+			<Add option="-DDISABLE_SAGA" />
 			<Add directory="..\.." />
 			<Add directory="..\..\engines" />
 			<Add directory="..\..\common" />
@@ -32,23 +45,20 @@
 		</Compiler>
 		<Linker>
 			<Add option="scummvm/engines/parallaction/libparallaction.a" />
-			<Add option="scummvm/engines/queen/libqueen.a" />
-			<Add option="scummvm/engines/agi/libagi.a" />
-			<Add option="scummvm\engines\agos\libagos.a" />
-			<Add option="scummvm/engines/cine/libcine.a" />
-			<Add option="scummvm\engines\gob\libgob.a" />
-			<Add option="scummvm/engines/saga/libsaga.a" />
-			<Add option="scummvm\engines\lure\liblure.a" />
-			<Add option="scummvm/engines/kyra/libkyra.a" />
-			<Add option="scummvm/engines/sword1/libsword1.a" />
-			<Add option="scummvm\engines\sword2/libsword2.a" />
-			<Add option="scummvm/engines/scumm/libscumm.a" />
-			<Add option="scummvm\engines\touche\libtouche.a" />
-			<Add option="scummvm/engines/sky/libsky.a" />
 			<Add library="SDL.dll" />
 			<Add library="winmm" />
 			<Add directory='&quot;C:\Documents and Settings\UsoQuotidiano\Documenti\soft\scummvm\SDL-1.2.9\lib&quot;' />
 		</Linker>
+		<Unit filename="..\..\backends\events\default\default-events.cpp">
+			<Option compilerVar="CPP" />
+			<Option target="default" />
+		</Unit>
+		<Unit filename="..\..\backends\events\default\default-events.h">
+			<Option compilerVar="CPP" />
+			<Option compile="0" />
+			<Option link="0" />
+			<Option target="default" />
+		</Unit>
 		<Unit filename="..\..\backends\fs\windows\windows-fs.cpp">
 			<Option compilerVar="CPP" />
 			<Option target="default" />
@@ -699,6 +709,10 @@
 			<Option link="0" />
 			<Option target="default" />
 		</Unit>
+		<Unit filename="..\..\gui\object.cpp">
+			<Option compilerVar="CPP" />
+			<Option target="default" />
+		</Unit>
 		<Unit filename="..\..\gui\object.h">
 			<Option compilerVar="CPP" />
 			<Option compile="0" />
diff --git a/dists/codeblocks/scummvm.depend b/dists/codeblocks/scummvm.depend
index be78f4b1a5..287915b1d3 100644
--- a/dists/codeblocks/scummvm.depend
+++ b/dists/codeblocks/scummvm.depend
@@ -1403,7 +1403,7 @@
 	<windows.h>
 	<tchar.h>
 
-1173399217 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stdafx.h
+1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stdafx.h
 	<portdefs.h>
 	<strings.h>
 	<stdio.h>
@@ -1420,30 +1420,20 @@
 	"common/str.h"
 	"common/fs.h"
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\array.h
+1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\array.h
 	"common/scummsys.h"
-	<assert.h>
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\scummsys.h
-	<stdlib.h>
-	<stdio.h>
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\scummsys.h
 	"config.h"
 	<SDL_byteorder.h>
 	"palmversion.h"
 	"globals.h"
 	"extend.h"
 	"nds/jtypes.h"
-	<stdarg.h>
-	<ctype.h>
-	<string.h>
-	<math.h>
-	<time.h>
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.h
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.h
 	"common/scummsys.h"
 	"common/array.h"
-	<assert.h>
-	<string.h>
 
 1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\fs.h
 	"common/array.h"
@@ -1464,8 +1454,9 @@
 	"common/scummsys.h"
 	"common/timer.h"
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\timer.h
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\timer.h
 	"common/scummsys.h"
+	"common/noncopyable.h"
 
 1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\util.h
 	"common/scummsys.h"
@@ -1484,9 +1475,10 @@
 	"graphics/scaler.h"
 	"backends/intern.h"
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.h
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.h
 	"common/scummsys.h"
 	"common/mutex.h"
+	"common/noncopyable.h"
 	"common/rect.h"
 
 1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\mutex.h
@@ -1529,9 +1521,10 @@
 	"common/hash-str.h"
 	"graphics/font.h"
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\singleton.h
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\singleton.h
+	"common/noncopyable.h"
 
-1173467059 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.h
+1173785171 c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.h
 	"common/stdafx.h"
 	"common/func.h"
 	"common/str.h"
@@ -1569,9 +1562,8 @@
 	"common/util.h"
 	"base/game.h"
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\list.h
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\list.h
 	"common/scummsys.h"
-	<assert.h>
 
 1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\game.h
 	"common/stdafx.h"
@@ -1589,12 +1581,13 @@
 1173398925 c:\documents and settings\usoquotidiano\desktop\scummvm\base\main.h
 	"common/scummsys.h"
 
-1173398926 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.h
+1174117753 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.h
 	"common/stdafx.h"
 	"common/savefile.h"
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\savefile.h
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\savefile.h
 	"common/stdafx.h"
+	"common/noncopyable.h"
 	"common/scummsys.h"
 	"common/stream.h"
 
@@ -1613,7 +1606,7 @@
 
 1173398977 c:\documents and settings\usoquotidiano\desktop\scummvm\icons\scummvm.xpm
 
-1173398926 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\compressed\compressed-saves.cpp
+1173641251 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\compressed\compressed-saves.cpp
 	"common/stdafx.h"
 	"common/savefile.h"
 	"common/util.h"
@@ -1624,7 +1617,7 @@
 	"common/stdafx.h"
 	"common/savefile.h"
 
-1173398926 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.cpp
+1174117753 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\saves\default\default-saves.cpp
 	"common/stdafx.h"
 	"common/savefile.h"
 	"common/util.h"
@@ -1650,7 +1643,7 @@
 	"common/util.h"
 	"common/system.h"
 
-1173398925 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\commandline.cpp
+1173567046 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\commandline.cpp
 	"common/stdafx.h"
 	"engines/engine.h"
 	"base/commandLine.h"
@@ -1709,12 +1702,11 @@
 	"gui/theme.h"
 	"gui/widget.h"
 
-1173398882 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stack.h
+1173533496 c:\documents and settings\usoquotidiano\desktop\scummvm\common\stack.h
 	"common/scummsys.h"
-	<assert.h>
 	"common/array.h"
 
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.h
+1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme.h
 	"common/stdafx.h"
 	"common/system.h"
 	"common/rect.h"
@@ -1737,13 +1729,13 @@
 	"graphics/surface.h"
 	"gui/object.h"
 
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.h
+1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.h
 
 1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\message.h
 	"gui/dialog.h"
 	"common/str.h"
 
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.h
+1174117751 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.h
 	"common/scummsys.h"
 	"common/str.h"
 	"gui/object.h"
@@ -1760,7 +1752,7 @@
 
 1173398948 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\dc\dclauncherdialog.h
 
-1173398925 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.cpp
+1173906517 source:c:\documents and settings\usoquotidiano\desktop\scummvm\base\plugins.cpp
 	"base/plugins.h"
 	"common/util.h"
 
@@ -1815,7 +1807,7 @@
 	"common/stdafx.h"
 	"common/system.h"
 
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.cpp
+1173641249 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\file.cpp
 	"common/file.h"
 	"common/fs.h"
 	"common/hashmap.h"
@@ -1832,12 +1824,10 @@
 	"backends/fs/abstract-fs.h"
 	"common/util.h"
 
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.cpp
+1173533496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\hashmap.cpp
 	"common/hashmap.h"
-	<ctype.h>
 
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\md5.cpp
-	<string.h>
+1173533496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\md5.cpp
 	"common/file.h"
 	"common/md5.h"
 	"common/util.h"
@@ -1853,12 +1843,11 @@
 	"common/mutex.h"
 	"common/system.h"
 
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.cpp
+1173533496 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\str.cpp
 	"common/stdafx.h"
 	"common/str.h"
 	"common/hash-str.h"
 	"common/util.h"
-	<ctype.h>
 
 1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\stream.cpp
 	"common/stdafx.h"
@@ -1866,9 +1855,10 @@
 	"common/str.h"
 	"common/util.h"
 
-1173398882 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.cpp
+1174117753 source:c:\documents and settings\usoquotidiano\desktop\scummvm\common\system.cpp
 	"common/stdafx.h"
 	"backends/intern.h"
+	"backends/events/default/default-events.h"
 	"gui/message.h"
 	"common/config-manager.h"
 	"common/system.h"
@@ -1903,7 +1893,7 @@
 	"gui/debugger.h"
 	"backends/platform/ps2/fileio.h"
 
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.h
+1173900476 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.h
 
 1173399217 source:c:\documents and settings\usoquotidiano\desktop\scummvm\engines\engine.cpp
 	"common/stdafx.h"
@@ -2101,7 +2091,7 @@
 	"common/scummsys.h"
 	"common/system.h"
 
-1173398810 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\scumm.h
+1173641246 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\scumm.h
 	"engines/engine.h"
 	"common/endian.h"
 	"common/file.h"
@@ -2113,7 +2103,7 @@
 	"scumm/script.h"
 	"sound/mididrv.h"
 
-1173398810 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\gfx.h
+1173533494 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\gfx.h
 	"graphics/surface.h"
 
 1173398810 c:\documents and settings\usoquotidiano\desktop\scummvm\engines\scumm\plugin.h
@@ -2164,7 +2154,7 @@
 	"gui/Key.h"
 	"gui/Actions.h"
 
-1173398935 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\symbian\src\symbianactions.h
+1173900478 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\platform\symbian\src\symbianactions.h
 	"common/stdafx.h"
 	"common/scummsys.h"
 	"common/system.h"
@@ -2324,18 +2314,17 @@
 	"common/system.h"
 	"graphics/font.h"
 
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\console.h
+1173533495 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\console.h
 	"gui/dialog.h"
 	"gui/newgui.h"
-	<stdarg.h>
 
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.cpp
+1173900476 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\debugger.cpp
 	"common/stdafx.h"
 	"common/system.h"
 	"gui/debugger.h"
 	"gui/console.h"
 
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.cpp
+1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\dialog.cpp
 	"common/stdafx.h"
 	"gui/newgui.h"
 	"gui/dialog.h"
@@ -2356,7 +2345,7 @@
 	"gui/newgui.h"
 	"graphics/scaler.h"
 
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\launcher.cpp
+1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\launcher.cpp
 	"common/stdafx.h"
 	"engines/engine.h"
 	"base/game.h"
@@ -2386,7 +2375,7 @@
 	"common/fs.h"
 	"common/stack.h"
 
-1173398764 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.h
+1173562730 c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.h
 	"gui/dialog.h"
 	"common/str.h"
 	"gui/KeysDialog.h"
@@ -2397,7 +2386,7 @@
 	"gui/ListWidget.h"
 	"common/str.h"
 
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\massadd.cpp
+1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\massadd.cpp
 	"common/stdafx.h"
 	"engines/engine.h"
 	"base/game.h"
@@ -2415,8 +2404,9 @@
 	"gui/newgui.h"
 	"gui/widget.h"
 
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.cpp
+1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\newgui.cpp
 	"common/stdafx.h"
+	"common/events.h"
 	"common/system.h"
 	"common/util.h"
 	"graphics/cursorman.h"
@@ -2427,7 +2417,7 @@
 	"gui/ThemeClassic.h"
 	"common/config-manager.h"
 
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.cpp
+1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\options.cpp
 	"common/stdafx.h"
 	"gui/browser.h"
 	"gui/themebrowser.h"
@@ -2450,7 +2440,7 @@
 	"common/fs.h"
 	"common/array.h"
 
-1173398764 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme-config.cpp
+1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\theme-config.cpp
 	"gui/theme.h"
 	"gui/eval.h"
 
@@ -2589,7 +2579,7 @@
 	"sound/mididrv.h"
 	"common/util.h"
 
-1173398891 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.cpp
+1173562730 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mixer.cpp
 	"common/stdafx.h"
 	"common/file.h"
 	"common/util.h"
@@ -2648,16 +2638,17 @@
 	"sound/softsynth/emumidi.h"
 	<fluidsynth.h>
 
-1173398889 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32.cpp
+1174117753 source:c:\documents and settings\usoquotidiano\desktop\scummvm\sound\softsynth\mt32.cpp
 	"common/stdafx.h"
 	"common/scummsys.h"
 	"sound/softsynth/mt32/mt32emu.h"
 	"sound/softsynth/emumidi.h"
 	"sound/mpu401.h"
-	"common/util.h"
-	"common/file.h"
 	"common/config-manager.h"
+	"common/events.h"
+	"common/file.h"
 	"common/system.h"
+	"common/util.h"
 	"graphics/fontman.h"
 	"graphics/surface.h"
 
@@ -2824,3 +2815,25 @@
 1173398885 c:\documents and settings\usoquotidiano\desktop\scummvm\sound\mods\rjp1.h
 	"common/stream.h"
 
+1174117754 c:\documents and settings\usoquotidiano\desktop\scummvm\backends\events\default\default-events.h
+	"common/stdafx.h"
+	"common/events.h"
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\events.h
+	"common/rect.h"
+	"common/system.h"
+	"common/noncopyable.h"
+
+1174117754 source:c:\documents and settings\usoquotidiano\desktop\scummvm\backends\events\default\default-events.cpp
+	"common/stdafx.h"
+	"common/system.h"
+	"backends/events/default/default-events.h"
+
+1174117751 source:c:\documents and settings\usoquotidiano\desktop\scummvm\gui\object.cpp
+	"common/stdafx.h"
+	"common/system.h"
+	"gui/object.h"
+	"gui/widget.h"
+
+1174132564 c:\documents and settings\usoquotidiano\desktop\scummvm\common\noncopyable.h
+
diff --git a/dists/codeblocks/scummvm.layout b/dists/codeblocks/scummvm.layout
index fcbb23ad72..4bdc9a3e21 100644
--- a/dists/codeblocks/scummvm.layout
+++ b/dists/codeblocks/scummvm.layout
@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="default" />
-	<File name="..\..\backends\fs\windows\windows-fs.cpp" open="1" top="0" tabpos="10">
-		<Cursor position="991" topLine="5" />
+	<File name="..\..\backends\events\default\default-events.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="39" />
 	</File>
-	<File name="..\..\backends\midi\windows.cpp" open="1" top="0" tabpos="2">
-		<Cursor position="1071" topLine="15" />
+	<File name="..\..\backends\events\default\default-events.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="13" />
+	</File>
+	<File name="..\..\backends\fs\windows\windows-fs.cpp" open="0" top="0" tabpos="3">
+		<Cursor position="6675" topLine="207" />
+	</File>
+	<File name="..\..\backends\midi\windows.cpp" open="0" top="0" tabpos="4">
+		<Cursor position="2922" topLine="80" />
 	</File>
 	<File name="..\..\backends\platform\sdl\events.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="5928" topLine="213" />
 	</File>
-	<File name="..\..\backends\platform\sdl\graphics.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="4474" topLine="127" />
+	<File name="..\..\backends\platform\sdl\graphics.cpp" open="0" top="0" tabpos="5">
+		<Cursor position="47256" topLine="1698" />
 	</File>
 	<File name="..\..\backends\platform\sdl\sdl-common.h" open="0" top="0" tabpos="0">
 		<Cursor position="7253" topLine="206" />
 	</File>
-	<File name="..\..\backends\platform\sdl\sdl.cpp" open="1" top="0" tabpos="5">
-		<Cursor position="1466" topLine="10" />
+	<File name="..\..\backends\platform\sdl\sdl.cpp" open="0" top="0" tabpos="6">
+		<Cursor position="3294" topLine="88" />
 	</File>
 	<File name="..\..\backends\saves\default\default-saves.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1794" topLine="33" />
@@ -25,11 +31,11 @@
 	<File name="..\..\backends\saves\savefile.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1740" topLine="11" />
 	</File>
-	<File name="..\..\backends\timer\default\default-timer.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="1311" topLine="10" />
+	<File name="..\..\backends\timer\default\default-timer.cpp" open="0" top="0" tabpos="7">
+		<Cursor position="3304" topLine="82" />
 	</File>
 	<File name="..\..\base\commandLine.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="12102" topLine="287" />
+		<Cursor position="13025" topLine="298" />
 	</File>
 	<File name="..\..\base\game.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1060" topLine="27" />
@@ -37,8 +43,8 @@
 	<File name="..\..\base\main.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="10180" topLine="267" />
 	</File>
-	<File name="..\..\base\plugins.cpp" open="1" top="0" tabpos="7">
-		<Cursor position="2592" topLine="94" />
+	<File name="..\..\base\plugins.cpp" open="0" top="0" tabpos="8">
+		<Cursor position="1245" topLine="19" />
 	</File>
 	<File name="..\..\base\plugins.h" open="0" top="0" tabpos="0">
 		<Cursor position="7833" topLine="188" />
@@ -50,13 +56,13 @@
 		<Cursor position="8666" topLine="282" />
 	</File>
 	<File name="..\..\common\array.h" open="0" top="0" tabpos="0">
-		<Cursor position="1119" topLine="129" />
+		<Cursor position="1099" topLine="46" />
 	</File>
 	<File name="..\..\common\config-file.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="7460" topLine="248" />
+		<Cursor position="4515" topLine="122" />
 	</File>
-	<File name="..\..\common\config-manager.cpp" open="1" top="0" tabpos="4">
-		<Cursor position="1205" topLine="15" />
+	<File name="..\..\common\config-manager.cpp" open="0" top="0" tabpos="4">
+		<Cursor position="7266" topLine="205" />
 	</File>
 	<File name="..\..\common\config-manager.h" open="0" top="0" tabpos="0">
 		<Cursor position="1658" topLine="12" />
@@ -65,43 +71,52 @@
 		<Cursor position="5094" topLine="126" />
 	</File>
 	<File name="..\..\common\file.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="10706" topLine="372" />
+		<Cursor position="8437" topLine="235" />
 	</File>
 	<File name="..\..\common\file.h" open="0" top="0" tabpos="13">
 		<Cursor position="1172" topLine="12" />
 	</File>
-	<File name="..\..\common\list.h" open="0" top="0" tabpos="0">
-		<Cursor position="5703" topLine="213" />
+	<File name="..\..\common\list.h" open="1" top="0" tabpos="17">
+		<Cursor position="1602" topLine="26" />
 	</File>
 	<File name="..\..\common\mutex.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1316" topLine="24" />
 	</File>
+	<File name="..\..\common\rect.h" open="0" top="0" tabpos="0">
+		<Cursor position="5584" topLine="130" />
+	</File>
 	<File name="..\..\common\savefile.h" open="0" top="0" tabpos="1">
-		<Cursor position="1342" topLine="10" />
+		<Cursor position="1342" topLine="55" />
 	</File>
 	<File name="..\..\common\scummsys.h" open="0" top="0" tabpos="0">
 		<Cursor position="9547" topLine="341" />
 	</File>
-	<File name="..\..\common\stdafx.h" open="1" top="0" tabpos="1">
+	<File name="..\..\common\singleton.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="39" />
+	</File>
+	<File name="..\..\common\stdafx.h" open="0" top="0" tabpos="1">
 		<Cursor position="3750" topLine="55" />
 	</File>
 	<File name="..\..\common\str.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="10347" topLine="401" />
 	</File>
 	<File name="..\..\common\str.h" open="0" top="0" tabpos="0">
-		<Cursor position="18" topLine="0" />
+		<Cursor position="6138" topLine="163" />
 	</File>
 	<File name="..\..\common\stream.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1828" topLine="46" />
 	</File>
-	<File name="..\..\common\stream.h" open="1" top="0" tabpos="3">
+	<File name="..\..\common\stream.h" open="0" top="0" tabpos="3">
 		<Cursor position="11237" topLine="339" />
 	</File>
 	<File name="..\..\common\system.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="1888" topLine="29" />
 	</File>
 	<File name="..\..\common\system.h" open="0" top="0" tabpos="2">
-		<Cursor position="10641" topLine="232" />
+		<Cursor position="29061" topLine="781" />
+	</File>
+	<File name="..\..\common\timer.h" open="0" top="0" tabpos="0">
+		<Cursor position="0" topLine="10" />
 	</File>
 	<File name="..\..\common\unzip.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="9067" topLine="298" />
@@ -110,9 +125,9 @@
 		<Cursor position="11348" topLine="425" />
 	</File>
 	<File name="..\..\common\util.h" open="0" top="0" tabpos="2">
-		<Cursor position="7810" topLine="35" />
+		<Cursor position="5919" topLine="185" />
 	</File>
-	<File name="..\..\engines\engine.cpp" open="1" top="0" tabpos="6">
+	<File name="..\..\engines\engine.cpp" open="0" top="0" tabpos="6">
 		<Cursor position="1299" topLine="6" />
 	</File>
 	<File name="..\..\graphics\dxa_player.cpp" open="0" top="0" tabpos="0">
@@ -128,10 +143,10 @@
 		<Cursor position="1053" topLine="0" />
 	</File>
 	<File name="..\..\graphics\surface.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="3986" topLine="134" />
+		<Cursor position="2432" topLine="171" />
 	</File>
-	<File name="..\..\graphics\surface.h" open="0" top="0" tabpos="0">
-		<Cursor position="2083" topLine="24" />
+	<File name="..\..\graphics\surface.h" open="0" top="0" tabpos="10">
+		<Cursor position="1817" topLine="25" />
 	</File>
 	<File name="..\..\gui\ListWidget.h" open="0" top="0" tabpos="0">
 		<Cursor position="1693" topLine="25" />
@@ -142,6 +157,9 @@
 	<File name="..\..\gui\ThemeModern.cpp" open="0" top="0" tabpos="8">
 		<Cursor position="1928" topLine="22" />
 	</File>
+	<File name="..\..\gui\debugger.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="5444" topLine="160" />
+	</File>
 	<File name="..\..\gui\dialog.cpp" open="0" top="0" tabpos="0">
 		<Cursor position="2732" topLine="48" />
 	</File>
@@ -199,10 +217,10 @@
 	<File name="..\..\sound\mixer.h" open="0" top="0" tabpos="0">
 		<Cursor position="1127" topLine="161" />
 	</File>
-	<File name="..\..\sound\mods\paula.cpp" open="1" top="0" tabpos="9">
+	<File name="..\..\sound\mods\paula.cpp" open="0" top="0" tabpos="9">
 		<Cursor position="1084" topLine="4" />
 	</File>
-	<File name="..\..\sound\mods\paula.h" open="1" top="0" tabpos="8">
+	<File name="..\..\sound\mods\paula.h" open="0" top="0" tabpos="8">
 		<Cursor position="2346" topLine="39" />
 	</File>
 	<File name="..\..\sound\mp3.h" open="0" top="0" tabpos="0">
diff --git a/dists/codeblocks/scummvm.workspace b/dists/codeblocks/scummvm.workspace
index 80af1552b6..755f22dd30 100644
--- a/dists/codeblocks/scummvm.workspace
+++ b/dists/codeblocks/scummvm.workspace
@@ -3,33 +3,7 @@
 	<Workspace title="ScummVM">
 		<Project filename="scummvm.cbp">
 			<Depends filename="parallaction.cbp" />
-			<Depends filename="queen.cbp" />
-			<Depends filename="agi.cbp" />
-			<Depends filename="agos.cbp" />
-			<Depends filename="gob.cbp" />
-			<Depends filename="cine.cbp" />
-			<Depends filename="saga.cbp" />
-			<Depends filename="lure.cbp" />
-			<Depends filename="kyra.cbp" />
-			<Depends filename="sword1.cbp" />
-			<Depends filename="sword2.cbp" />
-			<Depends filename="touche.cbp" />
-			<Depends filename="scumm.cbp" />
-			<Depends filename="sky.cbp" />
 		</Project>
 		<Project filename="parallaction.cbp" active="1" />
-		<Project filename="queen.cbp" />
-		<Project filename="agi.cbp" />
-		<Project filename="agos.cbp" />
-		<Project filename="gob.cbp" />
-		<Project filename="cine.cbp" />
-		<Project filename="saga.cbp" />
-		<Project filename="lure.cbp" />
-		<Project filename="kyra.cbp" />
-		<Project filename="sword1.cbp" />
-		<Project filename="sword2.cbp" />
-		<Project filename="touche.cbp" />
-		<Project filename="scumm.cbp" />
-		<Project filename="sky.cbp" />
 	</Workspace>
 </CodeBlocks_workspace_file>
-- 
cgit v1.2.3