Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.

svn-id: r28966

1 files changed, 282 insertions, 3 deletions

diff --git a/dists/codeblocks/scumm.layout b/dists/codeblocks/scumm.layout
index 14abc9a51a..74529eea44 100644
--- a/dists/codeblocks/scumm.layout
+++ b/dists/codeblocks/scumm.layout
@@ -1,19 +1,298 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="" />
+	<File name="..\..\engines\scumm\actor.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\akos.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1129" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\base-costume.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1145" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\bomp.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1127" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\boxes.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\camera.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\charset.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1129" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\costume.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1134" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\cursor.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\debugger.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1135" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\detection.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1135" topLine="4" />
+	</File>
+	<File name="..\..\engines\scumm\detection_tables.h" open="0" top="0" tabpos="0">
+		<Cursor position="1214" topLine="7" />
+	</File>
+	<File name="..\..\engines\scumm\dialogs.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1135" topLine="0" />
+	</File>
 	<File name="..\..\engines\scumm\gfx.cpp" open="0" top="0" tabpos="2">
-		<Cursor position="27430" topLine="955" />
+		<Cursor position="1125" topLine="24" />
+	</File>
+	<File name="..\..\engines\scumm\he\animation_he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\cup_player_he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1150" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\floodfill_he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
 	</File>
 	<File name="..\..\engines\scumm\he\logic_he.cpp" open="0" top="0" tabpos="5">
-		<Cursor position="1167" topLine="0" />
+		<Cursor position="1140" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\logic_he.h" open="0" top="0" tabpos="0">
+		<Cursor position="1226" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\palette_he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1142" topLine="0" />
 	</File>
 	<File name="..\..\engines\scumm\he\resource_he.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="22484" topLine="687" />
+		<Cursor position="1146" topLine="25" />
 	</File>
 	<File name="..\..\engines\scumm\he\resource_he.h" open="0" top="0" tabpos="4">
 		<Cursor position="3416" topLine="78" />
 	</File>
+	<File name="..\..\engines\scumm\he\script_v100he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1150" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\script_v60he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\script_v70he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1145" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\script_v72he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\script_v80he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\script_v90he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\sound_he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1140" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\sprite_he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1142" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\he\wiz_he.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1136" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\help.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1133" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\imuse.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1137" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\imuse_part.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1147" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\imuse_player.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1151" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\instrument.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1147" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\instrument.h" open="0" top="0" tabpos="0">
+		<Cursor position="1213" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\sysex.h" open="0" top="0" tabpos="0">
+		<Cursor position="1193" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\sysex_samnmax.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1153" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse\sysex_scumm.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1149" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1144" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_bndmgr.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1157" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_codecs.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1157" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_music.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1155" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_script.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1158" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1156" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_sndmgr.h" open="0" top="0" tabpos="0">
+		<Cursor position="1226" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_tables.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1157" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\imuse_digi\dimuse_track.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1156" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\input.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\insane\insane.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1134" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\insane\insane_ben.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\insane\insane_enemy.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1152" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\insane\insane_iact.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1150" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\insane\insane_scenes.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1148" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\midiparser_eup.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1149" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\midiparser_ro.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1147" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\nut_renderer.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1145" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\object.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1133" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\palette.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1133" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\player_mod.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1141" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\player_nes.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1142" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\player_v1.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\player_v2.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1138" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\player_v2a.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1141" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\player_v3a.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1141" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\resource.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1137" topLine="0" />
+	</File>
 	<File name="..\..\engines\scumm\resource.h" open="0" top="0" tabpos="3">
 		<Cursor position="1173" topLine="0" />
 	</File>
+	<File name="..\..\engines\scumm\resource_v2.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1143" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\resource_v3.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1143" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\resource_v4.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1143" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\room.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1129" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\saveload.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1137" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\script.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1133" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\script_v0.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\script_v2.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\script_v5.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\script_v6.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\script_v8.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\scumm.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\channel.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1141" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\chunk.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1137" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\codec1.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1139" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\codec37.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1141" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\codec47.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1140" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\imuse_channel.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1153" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\saud_channel.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1151" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\smush_font.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1147" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\smush_mixer.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1149" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\smush_mixer.h" open="0" top="0" tabpos="0">
+		<Cursor position="1205" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\smush\smush_player.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1151" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\sound.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1128" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\string.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1133" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\thumbnail.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1140" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\usage_bits.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1145" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\util.h" open="0" top="0" tabpos="0">
+		<Cursor position="1175" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\vars.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1129" topLine="0" />
+	</File>
+	<File name="..\..\engines\scumm\verbs.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="1131" topLine="0" />
+	</File>
 </CodeBlocks_layout_file>