diff options
64 files changed, 798 insertions, 678 deletions
diff --git a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg index bf3c69ae08..67d9d83160 100644 --- a/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg +++ b/backends/platform/symbian/S60/scummvm-CVS-SymbianS60v1.pkg @@ -16,7 +16,7 @@ ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ; ; $URL:$ -; $Id:$ +; $Id$ ; ; diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg index a7126db4c8..32df2aee8b 100644 --- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg +++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg @@ -16,7 +16,7 @@ ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ; ; $URL:$ -; $Id:$ +; $Id$ ; ; diff --git a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg index aca927eadd..8a121227bc 100644 --- a/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg +++ b/backends/platform/symbian/UIQ2/scummvm-CVS-SymbianUIQ2.pkg @@ -16,7 +16,7 @@ ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ; ; $URL:$ -; $Id:$ +; $Id$ ; ; diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg index 5d6ce01525..5aad403074 100644 --- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg +++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg @@ -16,7 +16,7 @@ ; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ; ; $URL:$ -; $Id:$ +; $Id$ ; ; diff --git a/base/main.cpp b/base/main.cpp index ff246fd8b3..dbf740c2ec 100644 --- a/base/main.cpp +++ b/base/main.cpp @@ -228,7 +228,9 @@ static int runGame(const EnginePlugin *plugin, OSystem &system, const Common::St // Reset the file/directory mappings Common::File::resetDefaultDirectories(); - return 0; + + + return 1; // Changing from return 0, in order to return to launcher } diff --git a/dists/codeblocks/agi.layout b/dists/codeblocks/agi.layout index ad46f75a6a..1f0e41a47b 100644 --- a/dists/codeblocks/agi.layout +++ b/dists/codeblocks/agi.layout @@ -1,103 +1,103 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="default" /> - <File name="..\..\engines\agi\agi.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/agi.cpp" open="0" top="0" tabpos="0"> <Cursor position="1119" topLine="0" /> </File> - <File name="..\..\engines\agi\agi.h" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/agi.h" open="0" top="0" tabpos="0"> <Cursor position="1147" topLine="0" /> </File> - <File name="..\..\engines\agi\checks.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/checks.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\agi\console.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/console.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\agi\cycle.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/cycle.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\agi\detection.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/detection.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="0" /> </File> - <File name="..\..\engines\agi\font.h" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/font.h" open="0" top="0" tabpos="0"> <Cursor position="1167" topLine="0" /> </File> - <File name="..\..\engines\agi\global.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/global.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\agi\graphics.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/graphics.cpp" open="0" top="0" tabpos="0"> <Cursor position="1161" topLine="0" /> </File> - <File name="..\..\engines\agi\graphics.h" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/graphics.h" open="0" top="0" tabpos="0"> <Cursor position="1181" topLine="0" /> </File> - <File name="..\..\engines\agi\id.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/id.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="0" /> </File> - <File name="..\..\engines\agi\inv.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/inv.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="0" /> </File> - <File name="..\..\engines\agi\keyboard.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/keyboard.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\agi\keyboard.h" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/keyboard.h" open="0" top="0" tabpos="0"> <Cursor position="1181" topLine="0" /> </File> - <File name="..\..\engines\agi\loader_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/loader_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="4" /> </File> - <File name="..\..\engines\agi\loader_v3.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/loader_v3.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="4" /> </File> - <File name="..\..\engines\agi\logic.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/logic.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\agi\logic.h" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/logic.h" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="0" /> </File> - <File name="..\..\engines\agi\lzw.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/lzw.cpp" open="0" top="0" tabpos="0"> <Cursor position="1502" topLine="0" /> </File> - <File name="..\..\engines\agi\menu.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/menu.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\agi\motion.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/motion.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\agi\objects.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/objects.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\agi\op_cmd.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/op_cmd.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\agi\op_dbg.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/op_dbg.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\agi\op_test.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/op_test.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\agi\picture.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/picture.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\agi\preagi.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/preagi.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="4" /> </File> - <File name="..\..\engines\agi\preagi_common.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/preagi_common.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="4" /> </File> - <File name="..\..\engines\agi\preagi_mickey.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/preagi_mickey.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="4" /> </File> - <File name="..\..\engines\agi\saveload.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/saveload.cpp" open="0" top="0" tabpos="0"> <Cursor position="1266" topLine="0" /> </File> - <File name="..\..\engines\agi\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\agi\view.h" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/view.h" open="0" top="0" tabpos="0"> <Cursor position="1163" topLine="0" /> </File> - <File name="..\..\engines\agi\wagparser.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agi/wagparser.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="4" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/agos.layout b/dists/codeblocks/agos.layout index cdaad1e96c..83d5f76212 100644 --- a/dists/codeblocks/agos.layout +++ b/dists/codeblocks/agos.layout @@ -1,136 +1,136 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="default" /> - <File name="..\..\engines\agos\agos.cpp" open="0" top="0" tabpos="1"> + <File name="../../engines/agos/agos.cpp" open="0" top="0" tabpos="1"> <Cursor position="1128" topLine="25" /> </File> - <File name="..\..\engines\agos\animation.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/animation.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\agos\charset.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/charset.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\agos\contain.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/contain.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\agos\cursor.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/cursor.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\agos\debug.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/debug.cpp" open="0" top="0" tabpos="0"> <Cursor position="1155" topLine="0" /> </File> - <File name="..\..\engines\agos\debug.h" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/debug.h" open="0" top="0" tabpos="0"> <Cursor position="1200" topLine="0" /> </File> - <File name="..\..\engines\agos\debugger.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/debugger.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="0" /> </File> - <File name="..\..\engines\agos\detection.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/detection.cpp" open="0" top="0" tabpos="0"> <Cursor position="1128" topLine="9" /> </File> - <File name="..\..\engines\agos\draw.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/draw.cpp" open="0" top="0" tabpos="0"> <Cursor position="1128" topLine="0" /> </File> - <File name="..\..\engines\agos\event.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/event.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="0" /> </File> - <File name="..\..\engines\agos\gfx.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/gfx.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="0" /> </File> - <File name="..\..\engines\agos\icons.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/icons.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\agos\input.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/input.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\agos\items.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/items.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="0" /> </File> - <File name="..\..\engines\agos\menus.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/menus.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="0" /> </File> - <File name="..\..\engines\agos\midi.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/midi.cpp" open="0" top="0" tabpos="0"> <Cursor position="1128" topLine="0" /> </File> - <File name="..\..\engines\agos\midiparser_s1d.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/midiparser_s1d.cpp" open="0" top="0" tabpos="0"> <Cursor position="1148" topLine="0" /> </File> - <File name="..\..\engines\agos\oracle.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/oracle.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\agos\res.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/res.cpp" open="0" top="0" tabpos="0"> <Cursor position="1171" topLine="26" /> </File> - <File name="..\..\engines\agos\res_ami.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/res_ami.cpp" open="0" top="0" tabpos="0"> <Cursor position="1196" topLine="0" /> </File> - <File name="..\..\engines\agos\res_snd.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/res_snd.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\agos\rooms.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/rooms.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="0" /> </File> - <File name="..\..\engines\agos\saveload.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/saveload.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="0" /> </File> - <File name="..\..\engines\agos\script.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script.cpp" open="0" top="0" tabpos="0"> <Cursor position="1176" topLine="0" /> </File> - <File name="..\..\engines\agos\script_e1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script_e1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="25" /> </File> - <File name="..\..\engines\agos\script_e2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script_e2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\agos\script_ff.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script_ff.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="0" /> </File> - <File name="..\..\engines\agos\script_pp.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script_pp.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\agos\script_s1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script_s1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="0" /> </File> - <File name="..\..\engines\agos\script_s2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script_s2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="25" /> </File> - <File name="..\..\engines\agos\script_ww.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/script_ww.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\agos\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="0" /> </File> - <File name="..\..\engines\agos\string.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/string.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\agos\subroutine.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/subroutine.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="0" /> </File> - <File name="..\..\engines\agos\verb.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/verb.cpp" open="0" top="0" tabpos="0"> <Cursor position="1155" topLine="0" /> </File> - <File name="..\..\engines\agos\vga.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/vga.cpp" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="0" /> </File> - <File name="..\..\engines\agos\vga_e2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/vga_e2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1172" topLine="0" /> </File> - <File name="..\..\engines\agos\vga_ff.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/vga_ff.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\agos\vga_s1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/vga_s1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\agos\vga_s2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/vga_s2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\agos\vga_ww.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/vga_ww.cpp" open="0" top="0" tabpos="0"> <Cursor position="1172" topLine="0" /> </File> - <File name="..\..\engines\agos\window.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/window.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\agos\zones.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/agos/zones.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/cine.layout b/dists/codeblocks/cine.layout index baf9bfb19b..f2ec3f308c 100644 --- a/dists/codeblocks/cine.layout +++ b/dists/codeblocks/cine.layout @@ -1,61 +1,61 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\cine\anim.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/cine/anim.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\cine\bg.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/bg.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\cine\bg_list.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/bg_list.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\cine\bg_list.h" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/bg_list.h" open="0" top="0" tabpos="0"> <Cursor position="1178" topLine="0" /> </File> - <File name="..\..\engines\cine\cine.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/cine.cpp" open="0" top="0" tabpos="0"> <Cursor position="1128" topLine="0" /> </File> - <File name="..\..\engines\cine\cine.h" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/cine.h" open="0" top="0" tabpos="0"> <Cursor position="1158" topLine="0" /> </File> - <File name="..\..\engines\cine\detection.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/detection.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\cine\main_loop.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/main_loop.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="0" /> </File> - <File name="..\..\engines\cine\msg.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/msg.cpp" open="0" top="0" tabpos="0"> <Cursor position="1126" topLine="0" /> </File> - <File name="..\..\engines\cine\object.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/object.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\cine\prc.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/prc.cpp" open="0" top="0" tabpos="0"> <Cursor position="1126" topLine="0" /> </File> - <File name="..\..\engines\cine\rel.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/rel.cpp" open="0" top="0" tabpos="0"> <Cursor position="1126" topLine="0" /> </File> - <File name="..\..\engines\cine\script.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/script.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\cine\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="22151" topLine="769" /> </File> - <File name="..\..\engines\cine\texte.h" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/texte.h" open="0" top="0" tabpos="0"> <Cursor position="1172" topLine="0" /> </File> - <File name="..\..\engines\cine\unpack.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/unpack.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\cine\unpack.h" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/unpack.h" open="0" top="0" tabpos="0"> <Cursor position="1176" topLine="0" /> </File> - <File name="..\..\engines\cine\various.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/various.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\cine\various.h" open="0" top="0" tabpos="0"> + <File name="../../engines/cine/various.h" open="0" top="0" tabpos="0"> <Cursor position="1180" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/gob.layout b/dists/codeblocks/gob.layout index d1f6d86984..b7e320f35f 100644 --- a/dists/codeblocks/gob.layout +++ b/dists/codeblocks/gob.layout @@ -1,151 +1,151 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\gob\cdrom.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/gob/cdrom.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\gob\coktelvideo.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/coktelvideo.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="4" /> </File> - <File name="..\..\engines\gob\dataio.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/dataio.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\gob\dataio.h" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/dataio.h" open="0" top="0" tabpos="0"> <Cursor position="1171" topLine="0" /> </File> - <File name="..\..\engines\gob\detection.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/detection.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="25" /> </File> - <File name="..\..\engines\gob\draw.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/draw.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="0" /> </File> - <File name="..\..\engines\gob\draw_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/draw_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\gob\draw_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/draw_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\gob\driver_vga.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/driver_vga.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="0" /> </File> - <File name="..\..\engines\gob\game.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/game.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="0" /> </File> - <File name="..\..\engines\gob\game_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/game_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\gob\game_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/game_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1152" topLine="0" /> </File> - <File name="..\..\engines\gob\global.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/global.cpp" open="0" top="0" tabpos="0"> <Cursor position="1570" topLine="29" /> </File> - <File name="..\..\engines\gob\gob.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/gob.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="0" /> </File> - <File name="..\..\engines\gob\gob.h" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/gob.h" open="0" top="0" tabpos="0"> <Cursor position="1159" topLine="0" /> </File> - <File name="..\..\engines\gob\goblin_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/goblin_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="0" /> </File> - <File name="..\..\engines\gob\goblin_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/goblin_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\gob\init.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/init.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="0" /> </File> - <File name="..\..\engines\gob\init_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/init_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\gob\init_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/init_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\gob\init_v3.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/init_v3.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="1" /> </File> - <File name="..\..\engines\gob\inter.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/inter.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\gob\inter_bargon.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/inter_bargon.cpp" open="0" top="0" tabpos="0"> <Cursor position="1141" topLine="0" /> </File> - <File name="..\..\engines\gob\inter_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/inter_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\gob\inter_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/inter_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\gob\inter_v3.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/inter_v3.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="4" /> </File> - <File name="..\..\engines\gob\inter_v4.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/inter_v4.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="4" /> </File> - <File name="..\..\engines\gob\map.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/map.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="0" /> </File> - <File name="..\..\engines\gob\map_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/map_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\gob\map_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/map_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\gob\map_v4.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/map_v4.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="4" /> </File> - <File name="..\..\engines\gob\mult.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/mult.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\gob\mult_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/mult_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\gob\mult_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/mult_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\gob\music.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/music.cpp" open="0" top="0" tabpos="0"> <Cursor position="1155" topLine="0" /> </File> - <File name="..\..\engines\gob\parse.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/parse.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\gob\parse_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/parse_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\gob\parse_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/parse_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\gob\saveload.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/saveload.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="4" /> </File> - <File name="..\..\engines\gob\saveload_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/saveload_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="4" /> </File> - <File name="..\..\engines\gob\saveload_v3.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/saveload_v3.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="4" /> </File> - <File name="..\..\engines\gob\scenery.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/scenery.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\gob\scenery_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/scenery_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="0" /> </File> - <File name="..\..\engines\gob\scenery_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/scenery_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="0" /> </File> - <File name="..\..\engines\gob\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\gob\util.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/util.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="0" /> </File> - <File name="..\..\engines\gob\video.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/video.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\gob\video_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/video_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\gob\video_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/gob/video_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/kyra.layout b/dists/codeblocks/kyra.layout index 0813dbd546..30110c7e5a 100644 --- a/dists/codeblocks/kyra.layout +++ b/dists/codeblocks/kyra.layout @@ -1,67 +1,67 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\kyra\animator_v1.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/kyra/animator_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1963" topLine="34" /> </File> - <File name="..\..\engines\kyra\debugger.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/debugger.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\kyra\kyra.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/kyra.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\kyra\kyra3.cpp" open="0" top="0" tabpos="0"> + <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"> + <File name="../../engines/kyra/resource.cpp" open="0" top="0" tabpos="3"> <Cursor position="1136" topLine="25" /> </File> - <File name="..\..\engines\kyra\resource.h" open="0" top="0" tabpos="4"> + <File name="../../engines/kyra/resource.h" open="0" top="0" tabpos="4"> <Cursor position="1183" topLine="28" /> </File> - <File name="..\..\engines\kyra\saveload_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/saveload_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="4" /> </File> - <File name="..\..\engines\kyra\screen.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/screen.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\kyra\screen_v2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/screen_v2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="4" /> </File> - <File name="..\..\engines\kyra\script.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/script.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\kyra\script_v1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/script_v1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="0" /> </File> - <File name="..\..\engines\kyra\seqplayer.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/seqplayer.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="25" /> </File> - <File name="..\..\engines\kyra\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\kyra\sound.h" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/sound.h" open="0" top="0" tabpos="0"> <Cursor position="1947" topLine="2" /> </File> - <File name="..\..\engines\kyra\sound_adlib.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/sound_adlib.cpp" open="0" top="0" tabpos="0"> <Cursor position="1917" topLine="0" /> </File> - <File name="..\..\engines\kyra\sound_towns.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/sound_towns.cpp" open="0" top="0" tabpos="0"> <Cursor position="1142" topLine="0" /> </File> - <File name="..\..\engines\kyra\sprites.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/sprites.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\kyra\staticres.cpp" open="0" top="0" tabpos="2"> + <File name="../../engines/kyra/staticres.cpp" open="0" top="0" tabpos="2"> <Cursor position="1137" topLine="0" /> </File> - <File name="..\..\engines\kyra\text.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/text.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\kyra\vqa.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/vqa.cpp" open="0" top="0" tabpos="0"> <Cursor position="1416" topLine="0" /> </File> - <File name="..\..\engines\kyra\wsamovie.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/kyra/wsamovie.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/lure.layout b/dists/codeblocks/lure.layout index e771ed6136..6131c46252 100644 --- a/dists/codeblocks/lure.layout +++ b/dists/codeblocks/lure.layout @@ -1,61 +1,61 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\lure\debugger.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/lure/debugger.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="0" /> </File> - <File name="..\..\engines\lure\decode.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/decode.h" open="0" top="0" tabpos="0"> <Cursor position="1176" topLine="0" /> </File> - <File name="..\..\engines\lure\detection.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/detection.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\lure\disk.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/disk.cpp" open="0" top="0" tabpos="0"> <Cursor position="1128" topLine="0" /> </File> - <File name="..\..\engines\lure\disk.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/disk.h" open="0" top="0" tabpos="0"> <Cursor position="1168" topLine="0" /> </File> - <File name="..\..\engines\lure\events.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/events.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\lure\events.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/events.h" open="0" top="0" tabpos="0"> <Cursor position="1178" topLine="0" /> </File> - <File name="..\..\engines\lure\fights.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/fights.cpp" open="0" top="0" tabpos="0"> <Cursor position="0" topLine="15" /> </File> - <File name="..\..\engines\lure\game.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/game.h" open="0" top="0" tabpos="0"> <Cursor position="1170" topLine="0" /> </File> - <File name="..\..\engines\lure\hotspots.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/hotspots.cpp" open="0" top="0" tabpos="0"> <Cursor position="99018" topLine="3367" /> </File> - <File name="..\..\engines\lure\lure.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/lure.cpp" open="0" top="0" tabpos="0"> <Cursor position="3484" topLine="105" /> </File> - <File name="..\..\engines\lure\luredefs.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/luredefs.h" open="0" top="0" tabpos="0"> <Cursor position="1176" topLine="0" /> </File> - <File name="..\..\engines\lure\memory.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/memory.h" open="0" top="0" tabpos="0"> <Cursor position="1176" topLine="0" /> </File> - <File name="..\..\engines\lure\menu.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/menu.h" open="0" top="0" tabpos="0"> <Cursor position="1170" topLine="0" /> </File> - <File name="..\..\engines\lure\res_struct.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/res_struct.h" open="0" top="0" tabpos="0"> <Cursor position="9288" topLine="408" /> </File> - <File name="..\..\engines\lure\room.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/room.h" open="0" top="0" tabpos="0"> <Cursor position="1170" topLine="0" /> </File> - <File name="..\..\engines\lure\screen.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/screen.h" open="0" top="0" tabpos="0"> <Cursor position="1178" topLine="0" /> </File> - <File name="..\..\engines\lure\surface.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/surface.cpp" open="0" top="0" tabpos="0"> <Cursor position="25208" topLine="790" /> </File> - <File name="..\..\engines\lure\surface.h" open="0" top="0" tabpos="0"> + <File name="../../engines/lure/surface.h" open="0" top="0" tabpos="0"> <Cursor position="1182" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/parallaction.layout b/dists/codeblocks/parallaction.layout index 7259d16ac8..308627c044 100644 --- a/dists/codeblocks/parallaction.layout +++ b/dists/codeblocks/parallaction.layout @@ -1,112 +1,112 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="default" /> - <File name="..\..\engines\parallaction\callables_br.cpp" open="0" top="0" tabpos="26"> + <File name="../../engines/parallaction/callables_br.cpp" open="0" top="0" tabpos="26"> <Cursor position="1149" topLine="14" /> </File> - <File name="..\..\engines\parallaction\callables_ns.cpp" open="0" top="0" tabpos="16"> + <File name="../../engines/parallaction/callables_ns.cpp" open="0" top="0" tabpos="16"> <Cursor position="1151" topLine="15" /> </File> - <File name="..\..\engines\parallaction\debug.cpp" open="0" top="0" tabpos="5"> + <File name="../../engines/parallaction/debug.cpp" open="0" top="0" tabpos="5"> <Cursor position="1137" topLine="15" /> </File> - <File name="..\..\engines\parallaction\debug.h" open="0" top="0" tabpos="6"> + <File name="../../engines/parallaction/debug.h" open="0" top="0" tabpos="6"> <Cursor position="600" topLine="0" /> </File> - <File name="..\..\engines\parallaction\defs.h" open="0" top="0" tabpos="23"> + <File name="../../engines/parallaction/defs.h" open="0" top="0" tabpos="23"> <Cursor position="1189" topLine="17" /> </File> - <File name="..\..\engines\parallaction\detection.cpp" open="0" top="0" tabpos="20"> + <File name="../../engines/parallaction/detection.cpp" open="0" top="0" tabpos="20"> <Cursor position="1138" topLine="14" /> </File> - <File name="..\..\engines\parallaction\dialogue.cpp" open="0" top="0" tabpos="8"> + <File name="../../engines/parallaction/dialogue.cpp" open="0" top="0" tabpos="8"> <Cursor position="1141" topLine="14" /> </File> - <File name="..\..\engines\parallaction\disk.h" open="0" top="0" tabpos="28"> + <File name="../../engines/parallaction/disk.h" open="0" top="0" tabpos="28"> <Cursor position="4173" topLine="78" /> </File> - <File name="..\..\engines\parallaction\disk_br.cpp" open="0" top="0" tabpos="23"> + <File name="../../engines/parallaction/disk_br.cpp" open="0" top="0" tabpos="23"> <Cursor position="1139" topLine="14" /> </File> - <File name="..\..\engines\parallaction\disk_ns.cpp" open="0" top="0" tabpos="15"> + <File name="../../engines/parallaction/disk_ns.cpp" open="0" top="0" tabpos="15"> <Cursor position="1137" topLine="14" /> </File> - <File name="..\..\engines\parallaction\exec_br.cpp" open="0" top="0" tabpos="9"> + <File name="../../engines/parallaction/exec_br.cpp" open="0" top="0" tabpos="9"> <Cursor position="0" topLine="0" /> </File> - <File name="..\..\engines\parallaction\exec_ns.cpp" open="0" top="0" tabpos="6"> + <File name="../../engines/parallaction/exec_ns.cpp" open="0" top="0" tabpos="6"> <Cursor position="1139" topLine="14" /> </File> - <File name="..\..\engines\parallaction\font.cpp" open="0" top="0" tabpos="10"> + <File name="../../engines/parallaction/font.cpp" open="0" top="0" tabpos="10"> <Cursor position="1133" topLine="14" /> </File> - <File name="..\..\engines\parallaction\graphics.cpp" open="0" top="0" tabpos="14"> + <File name="../../engines/parallaction/graphics.cpp" open="0" top="0" tabpos="14"> <Cursor position="1141" topLine="14" /> </File> - <File name="..\..\engines\parallaction\graphics.h" open="0" top="0" tabpos="17"> + <File name="../../engines/parallaction/graphics.h" open="0" top="0" tabpos="17"> <Cursor position="1940" topLine="83" /> </File> - <File name="..\..\engines\parallaction\inventory.cpp" open="0" top="0" tabpos="11"> + <File name="../../engines/parallaction/inventory.cpp" open="0" top="0" tabpos="11"> <Cursor position="1143" topLine="14" /> </File> - <File name="..\..\engines\parallaction\inventory.h" open="0" top="0" tabpos="12"> + <File name="../../engines/parallaction/inventory.h" open="0" top="0" tabpos="12"> <Cursor position="1559" topLine="6" /> </File> - <File name="..\..\engines\parallaction\menu.cpp" open="0" top="0" tabpos="13"> + <File name="../../engines/parallaction/menu.cpp" open="0" top="0" tabpos="13"> <Cursor position="1133" topLine="14" /> </File> - <File name="..\..\engines\parallaction\menu.h" open="0" top="0" tabpos="10"> + <File name="../../engines/parallaction/menu.h" open="0" top="0" tabpos="10"> <Cursor position="1382" topLine="2" /> </File> - <File name="..\..\engines\parallaction\module.mk" open="0" top="0" tabpos="7"> + <File name="../../engines/parallaction/module.mk" open="0" top="0" tabpos="7"> <Cursor position="131" topLine="0" /> </File> - <File name="..\..\engines\parallaction\objects.cpp" open="0" top="0" tabpos="1"> + <File name="../../engines/parallaction/objects.cpp" open="0" top="0" tabpos="1"> <Cursor position="1139" topLine="14" /> </File> - <File name="..\..\engines\parallaction\objects.h" open="0" top="0" tabpos="4"> + <File name="../../engines/parallaction/objects.h" open="0" top="0" tabpos="4"> <Cursor position="6066" topLine="247" /> </File> - <File name="..\..\engines\parallaction\parallaction.cpp" open="0" top="0" tabpos="2"> + <File name="../../engines/parallaction/parallaction.cpp" open="0" top="0" tabpos="2"> <Cursor position="1147" topLine="14" /> </File> - <File name="..\..\engines\parallaction\parallaction.h" open="0" top="0" tabpos="3"> + <File name="../../engines/parallaction/parallaction.h" open="0" top="0" tabpos="3"> <Cursor position="1276" topLine="24" /> </File> - <File name="..\..\engines\parallaction\parallaction_br.cpp" open="0" top="0" tabpos="13"> + <File name="../../engines/parallaction/parallaction_br.cpp" open="0" top="0" tabpos="13"> <Cursor position="7185" topLine="305" /> </File> - <File name="..\..\engines\parallaction\parallaction_ns.cpp" open="0" top="0" tabpos="7"> + <File name="../../engines/parallaction/parallaction_ns.cpp" open="0" top="0" tabpos="7"> <Cursor position="1155" topLine="14" /> </File> - <File name="..\..\engines\parallaction\parser.cpp" open="0" top="0" tabpos="16"> + <File name="../../engines/parallaction/parser.cpp" open="0" top="0" tabpos="16"> <Cursor position="1135" topLine="14" /> </File> - <File name="..\..\engines\parallaction\parser.h" open="0" top="0" tabpos="12"> + <File name="../../engines/parallaction/parser.h" open="0" top="0" tabpos="12"> <Cursor position="1497" topLine="12" /> </File> - <File name="..\..\engines\parallaction\parser_br.cpp" open="0" top="0" tabpos="10"> + <File name="../../engines/parallaction/parser_br.cpp" open="0" top="0" tabpos="10"> <Cursor position="0" topLine="0" /> </File> - <File name="..\..\engines\parallaction\parser_ns.cpp" open="0" top="0" tabpos="7"> + <File name="../../engines/parallaction/parser_ns.cpp" open="0" top="0" tabpos="7"> <Cursor position="1143" topLine="14" /> </File> - <File name="..\..\engines\parallaction\saveload.cpp" open="0" top="0" tabpos="9"> + <File name="../../engines/parallaction/saveload.cpp" open="0" top="0" tabpos="9"> <Cursor position="1141" topLine="14" /> </File> - <File name="..\..\engines\parallaction\sound.cpp" open="0" top="0" tabpos="24"> + <File name="../../engines/parallaction/sound.cpp" open="0" top="0" tabpos="24"> <Cursor position="1135" topLine="14" /> </File> - <File name="..\..\engines\parallaction\sound.h" open="0" top="0" tabpos="16"> + <File name="../../engines/parallaction/sound.h" open="0" top="0" tabpos="16"> <Cursor position="2404" topLine="45" /> </File> - <File name="..\..\engines\parallaction\staticres.cpp" open="0" top="0" tabpos="4"> + <File name="../../engines/parallaction/staticres.cpp" open="0" top="0" tabpos="4"> <Cursor position="1143" topLine="14" /> </File> - <File name="..\..\engines\parallaction\walk.cpp" open="0" top="0" tabpos="10"> + <File name="../../engines/parallaction/walk.cpp" open="0" top="0" tabpos="10"> <Cursor position="3" topLine="21" /> </File> - <File name="..\..\engines\parallaction\walk.h" open="0" top="0" tabpos="1"> + <File name="../../engines/parallaction/walk.h" open="0" top="0" tabpos="1"> <Cursor position="1353" topLine="10" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/queen.layout b/dists/codeblocks/queen.layout index 1fc5f76f50..5f54b15e69 100644 --- a/dists/codeblocks/queen.layout +++ b/dists/codeblocks/queen.layout @@ -1,64 +1,64 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="default" /> - <File name="..\..\engines\queen\bankman.cpp" open="0" top="0" tabpos="1"> + <File name="../../engines/queen/bankman.cpp" open="0" top="0" tabpos="1"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\queen\command.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/command.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\queen\credits.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/credits.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\queen\cutaway.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/cutaway.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\queen\debug.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/debug.cpp" open="0" top="0" tabpos="0"> <Cursor position="1159" topLine="18" /> </File> - <File name="..\..\engines\queen\display.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/display.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\queen\graphics.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/graphics.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="0" /> </File> - <File name="..\..\engines\queen\grid.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/grid.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\queen\input.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/input.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="25" /> </File> - <File name="..\..\engines\queen\input.h" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/input.h" open="0" top="0" tabpos="0"> <Cursor position="1341" topLine="24" /> </File> - <File name="..\..\engines\queen\journal.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/journal.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\queen\logic.cpp" open="0" top="0" tabpos="3"> + <File name="../../engines/queen/logic.cpp" open="0" top="0" tabpos="3"> <Cursor position="1131" topLine="25" /> </File> - <File name="..\..\engines\queen\music.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/music.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\queen\musicdata.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/musicdata.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="0" /> </File> - <File name="..\..\engines\queen\queen.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/queen.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="25" /> </File> - <File name="..\..\engines\queen\resource.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/resource.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="0" /> </File> - <File name="..\..\engines\queen\sound.cpp" open="0" top="0" tabpos="2"> + <File name="../../engines/queen/sound.cpp" open="0" top="0" tabpos="2"> <Cursor position="1130" topLine="25" /> </File> - <File name="..\..\engines\queen\state.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/state.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\queen\talk.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/talk.cpp" open="0" top="0" tabpos="0"> <Cursor position="1128" topLine="0" /> </File> - <File name="..\..\engines\queen\walk.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/queen/walk.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/saga.layout b/dists/codeblocks/saga.layout index b26d0aeb1a..8f15395e37 100644 --- a/dists/codeblocks/saga.layout +++ b/dists/codeblocks/saga.layout @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\saga\gfx.h" open="0" top="0" tabpos="1"> + <ActiveTarget name="default" /> + <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"> + <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"> + <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"> + <File name="../../engines/saga/rscfile.h" open="0" top="0" tabpos="2"> <Cursor position="1398" topLine="19" /> </File> - <File name="..\..\engines\saga\saga.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/saga/saga.cpp" open="0" top="0" tabpos="0"> <Cursor position="8405" topLine="288" /> </File> - <File name="..\..\engines\saga\saveload.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/saga/saveload.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="0" /> </File> - <File name="..\..\engines\saga\scene.h" open="0" top="0" tabpos="0"> + <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 74529eea44..9053399096 100644 --- a/dists/codeblocks/scumm.layout +++ b/dists/codeblocks/scumm.layout @@ -1,298 +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"> + <ActiveTarget name="default" /> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <File name="../../engines/scumm/gfx.cpp" open="0" top="0" tabpos="2"> <Cursor position="1125" topLine="24" /> </File> - <File name="..\..\engines\scumm\he\animation_he.cpp" open="0" top="0" tabpos="0"> + <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"> + <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"> + <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"> + <File name="../../engines/scumm/he/logic_he.cpp" open="0" top="0" tabpos="5"> <Cursor position="1140" topLine="0" /> </File> - <File name="..\..\engines\scumm\he\logic_he.h" open="0" top="0" tabpos="0"> + <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"> + <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"> + <File name="../../engines/scumm/he/resource_he.cpp" open="0" top="0" tabpos="1"> <Cursor position="1146" topLine="25" /> </File> - <File name="..\..\engines\scumm\he\resource_he.h" open="0" 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\he\script_v100he.cpp" open="0" top="0" tabpos="0"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <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"> + <File name="../../engines/scumm/verbs.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/scummvm.layout b/dists/codeblocks/scummvm.layout index ece2973f92..a2d420ec68 100644 --- a/dists/codeblocks/scummvm.layout +++ b/dists/codeblocks/scummvm.layout @@ -1,514 +1,514 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> <ActiveTarget name="default" /> - <File name="..\..\backends\events\default\default-events.cpp" open="0" top="0" tabpos="27"> + <File name="../../backends/events/default/default-events.cpp" open="0" top="0" tabpos="27"> <Cursor position="1203" topLine="16" /> </File> - <File name="..\..\backends\events\default\default-events.h" open="0" top="0" tabpos="1"> + <File name="../../backends/events/default/default-events.h" open="0" top="0" tabpos="1"> <Cursor position="1271" topLine="17" /> </File> - <File name="..\..\backends\fs\abstract-fs-factory.h" open="0" top="0" tabpos="0"> + <File name="../../backends/fs/abstract-fs-factory.h" open="0" top="0" tabpos="0"> <Cursor position="2898" topLine="47" /> </File> - <File name="..\..\backends\fs\abstract-fs.h" open="0" top="0" tabpos="0"> + <File name="../../backends/fs/abstract-fs.h" open="0" top="0" tabpos="0"> <Cursor position="0" topLine="21" /> </File> - <File name="..\..\backends\midi\alsa.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/midi/alsa.cpp" open="0" top="0" tabpos="0"> <Cursor position="1230" topLine="9" /> </File> - <File name="..\..\backends\midi\coreaudio.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/midi/coreaudio.cpp" open="0" top="0" tabpos="0"> <Cursor position="1154" topLine="0" /> </File> - <File name="..\..\backends\midi\coremidi.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/midi/coremidi.cpp" open="0" top="0" tabpos="0"> <Cursor position="1152" topLine="0" /> </File> - <File name="..\..\backends\midi\morphos.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/midi/morphos.cpp" open="0" top="0" tabpos="0"> <Cursor position="1350" topLine="12" /> </File> - <File name="..\..\backends\midi\seq.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/midi/seq.cpp" open="0" top="0" tabpos="0"> <Cursor position="1405" topLine="0" /> </File> - <File name="..\..\backends\midi\windows.cpp" open="0" top="0" tabpos="4"> + <File name="../../backends/midi/windows.cpp" open="0" top="0" tabpos="4"> <Cursor position="1226" topLine="18" /> </File> - <File name="..\..\backends\platform\null\null.cpp" open="1" top="0" tabpos="1"> + <File name="../../backends/platform/null/null.cpp" open="0" top="0" tabpos="1"> <Cursor position="1136" topLine="9" /> </File> - <File name="..\..\backends\platform\sdl\events.cpp" open="0" top="0" tabpos="2"> + <File name="../../backends/platform/sdl/events.cpp" open="0" top="0" tabpos="2"> <Cursor position="5816" topLine="195" /> </File> - <File name="..\..\backends\platform\sdl\graphics.cpp" open="0" top="0" tabpos="14"> + <File name="../../backends/platform/sdl/graphics.cpp" open="0" top="0" tabpos="14"> <Cursor position="27910" topLine="1019" /> </File> - <File name="..\..\backends\platform\sdl\main.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/platform/sdl/main.cpp" open="0" top="0" tabpos="0"> <Cursor position="3110" topLine="65" /> </File> - <File name="..\..\backends\platform\sdl\sdl-common.h" open="0" top="0" tabpos="3"> + <File name="../../backends/platform/sdl/sdl-common.h" open="0" top="0" tabpos="3"> <Cursor position="11161" topLine="229" /> </File> - <File name="..\..\backends\platform\sdl\sdl.cpp" open="0" top="0" tabpos="7"> + <File name="../../backends/platform/sdl/sdl.cpp" open="0" top="0" tabpos="7"> <Cursor position="7162" topLine="202" /> </File> - <File name="..\..\backends\saves\compressed\compressed-saves.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/saves/compressed/compressed-saves.cpp" open="0" top="0" tabpos="0"> <Cursor position="1163" topLine="14" /> </File> - <File name="..\..\backends\saves\default\default-saves.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/saves/default/default-saves.cpp" open="0" top="0" tabpos="0"> <Cursor position="1203" topLine="16" /> </File> - <File name="..\..\backends\saves\savefile.cpp" open="0" top="0" tabpos="0"> + <File name="../../backends/saves/savefile.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="14" /> </File> - <File name="..\..\backends\timer\default\default-timer.cpp" open="0" top="0" tabpos="7"> + <File name="../../backends/timer/default/default-timer.cpp" open="0" top="0" tabpos="7"> <Cursor position="1154" topLine="13" /> </File> - <File name="..\..\base\commandLine.cpp" open="0" top="0" tabpos="14"> + <File name="../../base/commandLine.cpp" open="0" top="0" tabpos="14"> <Cursor position="1130" topLine="14" /> </File> - <File name="..\..\base\game.cpp" open="0" top="0" tabpos="0"> - <Cursor position="0" topLine="41" /> + <File name="../../base/game.cpp" open="0" top="0" tabpos="0"> + <Cursor position="3217" topLine="78" /> </File> - <File name="..\..\base\main.cpp" open="0" top="0" tabpos="1"> - <Cursor position="1506" topLine="22" /> + <File name="../../base/main.cpp" open="1" top="1" tabpos="1"> + <Cursor position="10273" topLine="306" /> </File> - <File name="..\..\base\main.h" open="0" top="0" tabpos="0"> + <File name="../../base/main.h" open="0" top="0" tabpos="0"> <Cursor position="1074" topLine="0" /> </File> - <File name="..\..\base\plugins.cpp" open="0" top="0" tabpos="3"> + <File name="../../base/plugins.cpp" open="0" top="0" tabpos="3"> <Cursor position="2915" topLine="80" /> </File> - <File name="..\..\base\plugins.h" open="0" top="0" tabpos="2"> + <File name="../../base/plugins.h" open="0" top="0" tabpos="2"> <Cursor position="1575" topLine="59" /> </File> - <File name="..\..\base\version.cpp" open="0" top="0" tabpos="0"> + <File name="../../base/version.cpp" open="0" top="0" tabpos="0"> <Cursor position="1124" topLine="14" /> </File> - <File name="..\..\common\advancedDetector.cpp" open="0" top="0" tabpos="16"> + <File name="../../common/advancedDetector.cpp" open="0" top="0" tabpos="16"> <Cursor position="1142" topLine="14" /> </File> - <File name="..\..\common\advancedDetector.h" open="0" top="0" tabpos="18"> + <File name="../../common/advancedDetector.h" open="0" top="0" tabpos="18"> <Cursor position="2709" topLine="66" /> </File> - <File name="..\..\common\array.h" open="0" top="0" tabpos="3"> + <File name="../../common/array.h" open="0" top="0" tabpos="3"> <Cursor position="1170" topLine="6" /> </File> - <File name="..\..\common\config-file.cpp" open="0" top="0" tabpos="0"> + <File name="../../common/config-file.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="14" /> </File> - <File name="..\..\common\config-manager.cpp" open="0" top="0" tabpos="4"> + <File name="../../common/config-manager.cpp" open="0" top="0" tabpos="4"> <Cursor position="1268" topLine="20" /> </File> - <File name="..\..\common\config-manager.h" open="0" top="0" tabpos="0"> + <File name="../../common/config-manager.h" open="0" top="0" tabpos="0"> <Cursor position="2954" topLine="70" /> </File> - <File name="..\..\common\endian.h" open="0" top="0" tabpos="0"> + <File name="../../common/endian.h" open="0" top="0" tabpos="0"> <Cursor position="5451" topLine="152" /> </File> - <File name="..\..\common\file.cpp" open="0" top="0" tabpos="0"> + <File name="../../common/file.cpp" open="0" top="0" tabpos="0"> <Cursor position="15663" topLine="480" /> </File> - <File name="..\..\common\file.h" open="0" top="0" tabpos="13"> + <File name="../../common/file.h" open="0" top="0" tabpos="13"> <Cursor position="1164" topLine="17" /> </File> - <File name="..\..\common\fs.cpp" open="0" top="0" tabpos="0"> + <File name="../../common/fs.cpp" open="0" top="0" tabpos="0"> <Cursor position="2325" topLine="66" /> </File> - <File name="..\..\common\func.h" open="0" top="0" tabpos="2"> + <File name="../../common/func.h" open="0" top="0" tabpos="2"> <Cursor position="6966" topLine="226" /> </File> - <File name="..\..\common\hashmap.h" open="0" top="0" tabpos="0"> + <File name="../../common/hashmap.h" open="0" top="0" tabpos="0"> <Cursor position="2567" topLine="45" /> </File> - <File name="..\..\common\list.h" open="0" top="0" tabpos="1"> + <File name="../../common/list.h" open="0" top="0" tabpos="1"> <Cursor position="1773" topLine="20" /> </File> - <File name="..\..\common\md5.cpp" open="0" top="0" tabpos="20"> + <File name="../../common/md5.cpp" open="0" top="0" tabpos="20"> <Cursor position="1020" topLine="346" /> </File> - <File name="..\..\common\md5.h" open="0" top="0" tabpos="2"> + <File name="../../common/md5.h" open="0" top="0" tabpos="2"> <Cursor position="0" topLine="0" /> </File> - <File name="..\..\common\mutex.cpp" open="0" top="0" tabpos="18"> + <File name="../../common/mutex.cpp" open="0" top="0" tabpos="18"> <Cursor position="1122" topLine="14" /> </File> - <File name="..\..\common\mutex.h" open="0" top="0" tabpos="1"> + <File name="../../common/mutex.h" open="0" top="0" tabpos="1"> <Cursor position="1704" topLine="21" /> </File> - <File name="..\..\common\rect.h" open="0" top="0" tabpos="0"> + <File name="../../common/rect.h" open="0" top="0" tabpos="0"> <Cursor position="3482" topLine="67" /> </File> - <File name="..\..\common\savefile.h" open="0" top="0" tabpos="4"> + <File name="../../common/savefile.h" open="0" top="0" tabpos="4"> <Cursor position="1180" topLine="17" /> </File> - <File name="..\..\common\scummsys.h" open="0" top="0" tabpos="6"> + <File name="../../common/scummsys.h" open="0" top="0" tabpos="6"> <Cursor position="0" topLine="0" /> </File> - <File name="..\..\common\singleton.h" open="0" top="0" tabpos="0"> + <File name="../../common/singleton.h" open="0" top="0" tabpos="0"> <Cursor position="0" topLine="4" /> </File> - <File name="..\..\common\stack.h" open="0" top="0" tabpos="4"> + <File name="../../common/stack.h" open="0" top="0" tabpos="4"> <Cursor position="2403" topLine="72" /> </File> - <File name="..\..\common\str.cpp" open="0" top="0" tabpos="0"> + <File name="../../common/str.cpp" open="0" top="0" tabpos="0"> <Cursor position="1118" topLine="13" /> </File> - <File name="..\..\common\str.h" open="0" top="0" tabpos="2"> + <File name="../../common/str.h" open="0" top="0" tabpos="2"> <Cursor position="5060" topLine="135" /> </File> - <File name="..\..\common\stream.cpp" open="0" top="0" tabpos="0"> + <File name="../../common/stream.cpp" open="0" top="0" tabpos="0"> <Cursor position="1124" topLine="14" /> </File> - <File name="..\..\common\stream.h" open="0" top="0" tabpos="5"> + <File name="../../common/stream.h" open="0" top="0" tabpos="5"> <Cursor position="1172" topLine="17" /> </File> - <File name="..\..\common\system.cpp" open="0" top="0" tabpos="6"> + <File name="../../common/system.cpp" open="0" top="0" tabpos="6"> <Cursor position="1124" topLine="14" /> </File> - <File name="..\..\common\system.h" open="0" top="0" tabpos="4"> + <File name="../../common/system.h" open="0" top="0" tabpos="4"> <Cursor position="18676" topLine="453" /> </File> - <File name="..\..\common\timer.h" open="0" top="0" tabpos="0"> + <File name="../../common/timer.h" open="0" top="0" tabpos="0"> <Cursor position="0" topLine="8" /> </File> - <File name="..\..\common\unzip.cpp" open="0" top="0" tabpos="0"> + <File name="../../common/unzip.cpp" open="0" top="0" tabpos="0"> <Cursor position="1243" topLine="19" /> </File> - <File name="..\..\common\unzip.h" open="0" top="0" tabpos="0"> + <File name="../../common/unzip.h" open="0" top="0" tabpos="0"> <Cursor position="2913" topLine="56" /> </File> - <File name="..\..\common\util.cpp" open="0" top="0" tabpos="3"> + <File name="../../common/util.cpp" open="0" top="0" tabpos="3"> <Cursor position="1119" topLine="13" /> </File> - <File name="..\..\common\util.h" open="0" top="0" tabpos="1"> + <File name="../../common/util.h" open="0" top="0" tabpos="1"> <Cursor position="1184" topLine="16" /> </File> - <File name="..\..\engines\engine.cpp" open="0" top="0" tabpos="1"> + <File name="../../engines/engine.cpp" open="0" top="0" tabpos="1"> <Cursor position="1274" topLine="20" /> </File> - <File name="..\..\graphics\dxa_player.cpp" open="0" top="0" tabpos="5"> + <File name="../../graphics/dxa_player.cpp" open="0" top="0" tabpos="5"> <Cursor position="1131" topLine="14" /> </File> - <File name="..\..\graphics\font.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/font.cpp" open="0" top="0" tabpos="0"> <Cursor position="1122" topLine="13" /> </File> - <File name="..\..\graphics\font.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/font.h" open="0" top="0" tabpos="0"> <Cursor position="1677" topLine="25" /> </File> - <File name="..\..\graphics\fontman.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/fontman.h" open="0" top="0" tabpos="0"> <Cursor position="1182" topLine="16" /> </File> - <File name="..\..\graphics\fonts\consolefont.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/fonts/consolefont.cpp" open="0" top="0" tabpos="0"> <Cursor position="55" topLine="0" /> </File> - <File name="..\..\graphics\fonts\newfont.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/fonts/newfont.cpp" open="0" top="0" tabpos="0"> <Cursor position="55" topLine="0" /> </File> - <File name="..\..\graphics\fonts\newfont_big.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/fonts/newfont_big.cpp" open="0" top="0" tabpos="0"> <Cursor position="55" topLine="0" /> </File> - <File name="..\..\graphics\fonts\scummfont.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/fonts/scummfont.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="13" /> </File> - <File name="..\..\graphics\iff.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/iff.cpp" open="0" top="0" tabpos="0"> <Cursor position="3084" topLine="268" /> </File> - <File name="..\..\graphics\iff.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/iff.h" open="0" top="0" tabpos="0"> <Cursor position="1923" topLine="47" /> </File> - <File name="..\..\graphics\imagedec.cpp" open="0" top="0" tabpos="1"> + <File name="../../graphics/imagedec.cpp" open="0" top="0" tabpos="1"> <Cursor position="3897" topLine="4" /> </File> - <File name="..\..\graphics\imagedec.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/imagedec.h" open="0" top="0" tabpos="0"> <Cursor position="1186" topLine="16" /> </File> - <File name="..\..\graphics\imageman.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/imageman.cpp" open="0" top="0" tabpos="0"> <Cursor position="1217" topLine="0" /> </File> - <File name="..\..\graphics\imageman.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/imageman.h" open="0" top="0" tabpos="0"> <Cursor position="1186" topLine="16" /> </File> - <File name="..\..\graphics\mpeg_player.cpp" open="1" top="0" tabpos="2"> + <File name="../../graphics/mpeg_player.cpp" open="0" top="0" tabpos="2"> <Cursor position="1136" topLine="9" /> </File> - <File name="..\..\graphics\primitives.cpp" open="0" top="0" tabpos="4"> + <File name="../../graphics/primitives.cpp" open="0" top="0" tabpos="4"> <Cursor position="1134" topLine="13" /> </File> - <File name="..\..\graphics\primitives.h" open="0" top="0" tabpos="1"> + <File name="../../graphics/primitives.h" open="0" top="0" tabpos="1"> <Cursor position="1089" topLine="0" /> </File> - <File name="..\..\graphics\scaler.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/scaler.h" open="0" top="0" tabpos="0"> <Cursor position="1178" topLine="16" /> </File> - <File name="..\..\graphics\scaler\intern.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/scaler/intern.h" open="0" top="0" tabpos="0"> <Cursor position="1199" topLine="17" /> </File> - <File name="..\..\graphics\scaler\scale2x.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/scaler/scale2x.cpp" open="0" top="0" tabpos="0"> <Cursor position="1329" topLine="23" /> </File> - <File name="..\..\graphics\scaler\scale2x.h" open="0" top="0" tabpos="0"> + <File name="../../graphics/scaler/scale2x.h" open="0" top="0" tabpos="0"> <Cursor position="0" topLine="16" /> </File> - <File name="..\..\graphics\scaler\scale3x.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/scaler/scale3x.cpp" open="0" top="0" tabpos="0"> <Cursor position="1329" topLine="23" /> </File> - <File name="..\..\graphics\scaler\scalebit.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/scaler/scalebit.cpp" open="0" top="0" tabpos="0"> <Cursor position="1340" topLine="24" /> </File> - <File name="..\..\graphics\scaler\thumbnail.cpp" open="0" top="0" tabpos="0"> + <File name="../../graphics/scaler/thumbnail.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="14" /> </File> - <File name="..\..\graphics\surface.cpp" open="0" top="0" tabpos="2"> + <File name="../../graphics/surface.cpp" open="0" top="0" tabpos="2"> <Cursor position="1128" topLine="13" /> </File> - <File name="..\..\graphics\surface.h" open="0" top="0" tabpos="7"> + <File name="../../graphics/surface.h" open="0" top="0" tabpos="7"> <Cursor position="1491" topLine="20" /> </File> - <File name="..\..\gui\Actions.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/Actions.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="14" /> </File> - <File name="..\..\gui\Actions.h" open="0" top="0" tabpos="0"> + <File name="../../gui/Actions.h" open="0" top="0" tabpos="0"> <Cursor position="1167" topLine="17" /> </File> - <File name="..\..\gui\EditTextWidget.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/EditTextWidget.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="13" /> </File> - <File name="..\..\gui\Key.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/Key.cpp" open="0" top="0" tabpos="0"> <Cursor position="1115" topLine="14" /> </File> - <File name="..\..\gui\Key.h" open="0" top="0" tabpos="0"> + <File name="../../gui/Key.h" open="0" top="0" tabpos="0"> <Cursor position="1151" topLine="17" /> </File> - <File name="..\..\gui\KeysDialog.cpp" open="1" top="1" tabpos="3"> + <File name="../../gui/KeysDialog.cpp" open="0" top="0" tabpos="3"> <Cursor position="1264" topLine="9" /> </File> - <File name="..\..\gui\KeysDialog.h" open="0" top="0" tabpos="0"> + <File name="../../gui/KeysDialog.h" open="0" top="0" tabpos="0"> <Cursor position="1421" topLine="6" /> </File> - <File name="..\..\gui\ListWidget.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/ListWidget.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="13" /> </File> - <File name="..\..\gui\ListWidget.h" open="0" top="0" tabpos="0"> + <File name="../../gui/ListWidget.h" open="0" top="0" tabpos="0"> <Cursor position="1693" topLine="25" /> </File> - <File name="..\..\gui\PopUpWidget.cpp" open="0" top="0" tabpos="16"> + <File name="../../gui/PopUpWidget.cpp" open="0" top="0" tabpos="16"> <Cursor position="1131" topLine="13" /> </File> - <File name="..\..\gui\ScrollBarWidget.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/ScrollBarWidget.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="13" /> </File> - <File name="..\..\gui\TabWidget.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/TabWidget.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="13" /> </File> - <File name="..\..\gui\ThemeModern.cpp" open="0" top="0" tabpos="8"> + <File name="../../gui/ThemeModern.cpp" open="0" top="0" tabpos="8"> <Cursor position="1928" topLine="22" /> </File> - <File name="..\..\gui\about.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/about.cpp" open="0" top="0" tabpos="0"> <Cursor position="1119" topLine="13" /> </File> - <File name="..\..\gui\browser.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/browser.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="13" /> </File> - <File name="..\..\gui\chooser.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/chooser.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="13" /> </File> - <File name="..\..\gui\console.cpp" open="0" top="0" tabpos="3"> + <File name="../../gui/console.cpp" open="0" top="0" tabpos="3"> <Cursor position="1123" topLine="13" /> </File> - <File name="..\..\gui\debugger.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/debugger.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="14" /> </File> - <File name="..\..\gui\dialog.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/dialog.cpp" open="0" top="0" tabpos="0"> <Cursor position="1121" topLine="13" /> </File> - <File name="..\..\gui\dialog.h" open="0" top="0" tabpos="0"> + <File name="../../gui/dialog.h" open="0" top="0" tabpos="0"> <Cursor position="1177" topLine="12" /> </File> - <File name="..\..\gui\editable.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/editable.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="13" /> </File> - <File name="..\..\gui\eval.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/eval.cpp" open="0" top="0" tabpos="0"> <Cursor position="1117" topLine="14" /> </File> - <File name="..\..\gui\eval.h" open="0" top="0" tabpos="0"> + <File name="../../gui/eval.h" open="0" top="0" tabpos="0"> <Cursor position="1155" topLine="17" /> </File> - <File name="..\..\gui\launcher.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/launcher.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="13" /> </File> - <File name="..\..\gui\massadd.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/massadd.cpp" open="0" top="0" tabpos="0"> <Cursor position="1121" topLine="13" /> </File> - <File name="..\..\gui\message.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/message.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="13" /> </File> - <File name="..\..\gui\message.h" open="0" top="0" tabpos="0"> + <File name="../../gui/message.h" open="0" top="0" tabpos="0"> <Cursor position="1307" topLine="13" /> </File> - <File name="..\..\gui\newgui.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/newgui.cpp" open="0" top="0" tabpos="0"> <Cursor position="1121" topLine="13" /> </File> - <File name="..\..\gui\object.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/object.cpp" open="0" top="0" tabpos="0"> <Cursor position="1121" topLine="3" /> </File> - <File name="..\..\gui\object.h" open="0" top="0" tabpos="4"> + <File name="../../gui/object.h" open="0" top="0" tabpos="4"> <Cursor position="2088" topLine="33" /> </File> - <File name="..\..\gui\options.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/options.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="13" /> </File> - <File name="..\..\gui\theme-config.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/theme-config.cpp" open="0" top="0" tabpos="0"> <Cursor position="2171" topLine="30" /> </File> - <File name="..\..\gui\theme.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/theme.cpp" open="0" top="0" tabpos="0"> <Cursor position="1060" topLine="18" /> </File> - <File name="..\..\gui\theme.h" open="0" top="0" tabpos="0"> + <File name="../../gui/theme.h" open="0" top="0" tabpos="0"> <Cursor position="1153" topLine="16" /> </File> - <File name="..\..\gui\themebrowser.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/themebrowser.cpp" open="0" top="0" tabpos="0"> <Cursor position="988" topLine="13" /> </File> - <File name="..\..\gui\widget.cpp" open="0" top="0" tabpos="0"> + <File name="../../gui/widget.cpp" open="0" top="0" tabpos="0"> <Cursor position="1121" topLine="13" /> </File> - <File name="..\..\gui\widget.h" open="0" top="0" tabpos="0"> + <File name="../../gui/widget.h" open="0" top="0" tabpos="0"> <Cursor position="7947" topLine="222" /> </File> - <File name="..\..\sound\adpcm.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/adpcm.cpp" open="0" top="0" tabpos="0"> <Cursor position="1119" topLine="14" /> </File> - <File name="..\..\sound\adpcm.h" open="0" top="0" tabpos="0"> + <File name="../../sound/adpcm.h" open="0" top="0" tabpos="0"> <Cursor position="1165" topLine="5" /> </File> - <File name="..\..\sound\aiff.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/aiff.cpp" open="0" top="0" tabpos="0"> <Cursor position="1386" topLine="22" /> </File> - <File name="..\..\sound\audiocd.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/audiocd.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="14" /> </File> - <File name="..\..\sound\audiocd.h" open="0" top="0" tabpos="0"> + <File name="../../sound/audiocd.h" open="0" top="0" tabpos="0"> <Cursor position="1173" topLine="17" /> </File> - <File name="..\..\sound\audiostream.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/audiostream.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="14" /> </File> - <File name="..\..\sound\audiostream.h" open="0" top="0" tabpos="0"> + <File name="../../sound/audiostream.h" open="0" top="0" tabpos="0"> <Cursor position="1189" topLine="17" /> </File> - <File name="..\..\sound\flac.h" open="0" top="0" tabpos="0"> + <File name="../../sound/flac.h" open="0" top="0" tabpos="0"> <Cursor position="1161" topLine="17" /> </File> - <File name="..\..\sound\fmopl.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/fmopl.cpp" open="0" top="0" tabpos="0"> <Cursor position="1233" topLine="16" /> </File> - <File name="..\..\sound\fmopl.h" open="0" top="0" tabpos="0"> + <File name="../../sound/fmopl.h" open="0" top="0" tabpos="0"> <Cursor position="1154" topLine="0" /> </File> - <File name="..\..\sound\mididrv.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/mididrv.cpp" open="0" top="0" tabpos="0"> <Cursor position="1119" topLine="14" /> </File> - <File name="..\..\sound\mididrv.h" open="0" top="0" tabpos="1"> + <File name="../../sound/mididrv.h" open="0" top="0" tabpos="1"> <Cursor position="4230" topLine="136" /> </File> - <File name="..\..\sound\midiparser.cpp" open="0" top="0" tabpos="3"> + <File name="../../sound/midiparser.cpp" open="0" top="0" tabpos="3"> <Cursor position="1131" topLine="14" /> </File> - <File name="..\..\sound\midiparser.h" open="0" top="0" tabpos="2"> + <File name="../../sound/midiparser.h" open="0" top="0" tabpos="2"> <Cursor position="0" topLine="325" /> </File> - <File name="..\..\sound\midiparser_smf.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/midiparser_smf.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="14" /> </File> - <File name="..\..\sound\midiparser_xmidi.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/midiparser_xmidi.cpp" open="0" top="0" tabpos="0"> <Cursor position="1143" topLine="14" /> </File> - <File name="..\..\sound\mixer.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/mixer.cpp" open="0" top="0" tabpos="0"> <Cursor position="2725" topLine="101" /> </File> - <File name="..\..\sound\mixer.h" open="0" top="0" tabpos="8"> + <File name="../../sound/mixer.h" open="0" top="0" tabpos="8"> <Cursor position="1165" topLine="17" /> </File> - <File name="..\..\sound\mods\infogrames.h" open="0" top="0" tabpos="0"> + <File name="../../sound/mods/infogrames.h" open="0" top="0" tabpos="0"> <Cursor position="1968" topLine="16" /> </File> - <File name="..\..\sound\mods\module.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/mods/module.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="14" /> </File> - <File name="..\..\sound\mods\module.h" open="0" top="0" tabpos="0"> + <File name="../../sound/mods/module.h" open="0" top="0" tabpos="0"> <Cursor position="0" topLine="29" /> </File> - <File name="..\..\sound\mods\paula.cpp" open="0" top="0" tabpos="3"> + <File name="../../sound/mods/paula.cpp" open="0" top="0" tabpos="3"> <Cursor position="1240" topLine="11" /> </File> - <File name="..\..\sound\mods\paula.h" open="0" top="0" tabpos="2"> + <File name="../../sound/mods/paula.h" open="0" top="0" tabpos="2"> <Cursor position="2545" topLine="46" /> </File> - <File name="..\..\sound\mods\protracker.cpp" open="0" top="0" tabpos="1"> + <File name="../../sound/mods/protracker.cpp" open="0" top="0" tabpos="1"> <Cursor position="1131" topLine="14" /> </File> - <File name="..\..\sound\mods\protracker.h" open="0" top="0" tabpos="0"> + <File name="../../sound/mods/protracker.h" open="0" top="0" tabpos="0"> <Cursor position="1197" topLine="8" /> </File> - <File name="..\..\sound\mods\rjp1.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/mods/rjp1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1124" topLine="14" /> </File> - <File name="..\..\sound\mods\soundfx.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/mods/soundfx.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="12" /> </File> - <File name="..\..\sound\mp3.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/mp3.cpp" open="0" top="0" tabpos="0"> <Cursor position="3255" topLine="69" /> </File> - <File name="..\..\sound\mp3.h" open="0" top="0" tabpos="0"> + <File name="../../sound/mp3.h" open="0" top="0" tabpos="0"> <Cursor position="1157" topLine="17" /> </File> - <File name="..\..\sound\mpu401.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/mpu401.cpp" open="0" top="0" tabpos="0"> <Cursor position="1123" topLine="13" /> </File> - <File name="..\..\sound\mpu401.h" open="0" top="0" tabpos="0"> + <File name="../../sound/mpu401.h" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="17" /> </File> - <File name="..\..\sound\null.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/null.cpp" open="0" top="0" tabpos="0"> <Cursor position="1119" topLine="0" /> </File> - <File name="..\..\sound\rate.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/rate.cpp" open="0" top="0" tabpos="0"> <Cursor position="1489" topLine="22" /> </File> - <File name="..\..\sound\rate.h" open="0" top="0" tabpos="0"> + <File name="../../sound/rate.h" open="0" top="0" tabpos="0"> <Cursor position="1246" topLine="35" /> </File> - <File name="..\..\sound\softsynth\emumidi.h" open="0" top="0" tabpos="0"> + <File name="../../sound/softsynth/emumidi.h" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="13" /> </File> - <File name="..\..\sound\softsynth\fluidsynth.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/softsynth/fluidsynth.cpp" open="0" top="0" tabpos="0"> <Cursor position="1198" topLine="18" /> </File> - <File name="..\..\sound\softsynth\mt32.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/softsynth/mt32.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="13" /> </File> - <File name="..\..\sound\softsynth\mt32\freeverb.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/softsynth/mt32/freeverb.cpp" open="0" top="0" tabpos="0"> <Cursor position="1257" topLine="20" /> </File> - <File name="..\..\sound\softsynth\mt32\freeverb.h" open="0" top="0" tabpos="0"> + <File name="../../sound/softsynth/mt32/freeverb.h" open="0" top="0" tabpos="0"> <Cursor position="4321" topLine="133" /> </File> - <File name="..\..\sound\softsynth\mt32\mt32_file.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/softsynth/mt32/mt32_file.cpp" open="0" top="0" tabpos="0"> <Cursor position="1218" topLine="15" /> </File> - <File name="..\..\sound\softsynth\mt32\structures.h" open="0" top="0" tabpos="0"> + <File name="../../sound/softsynth/mt32/structures.h" open="0" top="0" tabpos="0"> <Cursor position="1781" topLine="16" /> </File> - <File name="..\..\sound\voc.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/voc.cpp" open="0" top="0" tabpos="0"> <Cursor position="1117" topLine="14" /> </File> - <File name="..\..\sound\voc.h" open="0" top="0" tabpos="0"> + <File name="../../sound/voc.h" open="0" top="0" tabpos="0"> <Cursor position="1157" topLine="17" /> </File> - <File name="..\..\sound\vorbis.h" open="0" top="0" tabpos="0"> + <File name="../../sound/vorbis.h" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="17" /> </File> - <File name="..\..\sound\wave.cpp" open="0" top="0" tabpos="0"> + <File name="../../sound/wave.cpp" open="0" top="0" tabpos="0"> <Cursor position="1119" topLine="14" /> </File> - <File name="..\..\sound\wave.h" open="0" top="0" tabpos="0"> + <File name="../../sound/wave.h" open="0" top="0" tabpos="0"> <Cursor position="1161" topLine="15" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/sky.layout b/dists/codeblocks/sky.layout index f4d0e30715..deab998e50 100644 --- a/dists/codeblocks/sky.layout +++ b/dists/codeblocks/sky.layout @@ -1,94 +1,94 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\sky\autoroute.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/sky/autoroute.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="0" /> </File> - <File name="..\..\engines\sky\autoroute.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/autoroute.h" open="0" top="0" tabpos="0"> <Cursor position="1185" topLine="0" /> </File> - <File name="..\..\engines\sky\compact.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/compact.cpp" open="0" top="0" tabpos="0"> <Cursor position="1137" topLine="0" /> </File> - <File name="..\..\engines\sky\control.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/control.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\sky\control.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/control.h" open="0" top="0" tabpos="0"> <Cursor position="1177" topLine="0" /> </File> - <File name="..\..\engines\sky\debug.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/debug.cpp" open="0" top="0" tabpos="0"> <Cursor position="1133" topLine="0" /> </File> - <File name="..\..\engines\sky\debug.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/debug.h" open="0" top="0" tabpos="0"> <Cursor position="1173" topLine="0" /> </File> - <File name="..\..\engines\sky\disk.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/disk.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\sky\disk.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/disk.h" open="0" top="0" tabpos="0"> <Cursor position="1165" topLine="0" /> </File> - <File name="..\..\engines\sky\grid.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/grid.h" open="0" top="0" tabpos="0"> <Cursor position="1165" topLine="0" /> </File> - <File name="..\..\engines\sky\intro.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/intro.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\sky\intro.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/intro.h" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="0" /> </File> - <File name="..\..\engines\sky\logic.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/logic.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\sky\logic.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/logic.h" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="0" /> </File> - <File name="..\..\engines\sky\mouse.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/mouse.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\sky\mouse.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/mouse.h" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="0" /> </File> - <File name="..\..\engines\sky\music\adlibchannel.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/music/adlibchannel.cpp" open="0" top="0" tabpos="0"> <Cursor position="1149" topLine="0" /> </File> - <File name="..\..\engines\sky\music\adlibmusic.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/music/adlibmusic.cpp" open="0" top="0" tabpos="0"> <Cursor position="1145" topLine="0" /> </File> - <File name="..\..\engines\sky\music\musicbase.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/music/musicbase.h" open="0" top="0" tabpos="0"> <Cursor position="1203" topLine="0" /> </File> - <File name="..\..\engines\sky\rnc_deco.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/rnc_deco.cpp" open="0" top="0" tabpos="0"> <Cursor position="1135" topLine="0" /> </File> - <File name="..\..\engines\sky\rnc_deco.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/rnc_deco.h" open="0" top="0" tabpos="0"> <Cursor position="1181" topLine="0" /> </File> - <File name="..\..\engines\sky\screen.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/screen.cpp" open="0" top="0" tabpos="0"> <Cursor position="1131" topLine="0" /> </File> - <File name="..\..\engines\sky\screen.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/screen.h" open="0" top="0" tabpos="0"> <Cursor position="1173" topLine="0" /> </File> - <File name="..\..\engines\sky\sky.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/sky.cpp" open="0" top="0" tabpos="0"> <Cursor position="1125" topLine="0" /> </File> - <File name="..\..\engines\sky\sky.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/sky.h" open="0" top="0" tabpos="0"> <Cursor position="1153" topLine="0" /> </File> - <File name="..\..\engines\sky\skydefs.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/skydefs.h" open="0" top="0" tabpos="0"> <Cursor position="1171" topLine="0" /> </File> - <File name="..\..\engines\sky\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="1129" topLine="0" /> </File> - <File name="..\..\engines\sky\sound.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/sound.h" open="0" top="0" tabpos="0"> <Cursor position="1169" topLine="0" /> </File> - <File name="..\..\engines\sky\text.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/text.cpp" open="0" top="0" tabpos="0"> <Cursor position="1127" topLine="0" /> </File> - <File name="..\..\engines\sky\text.h" open="0" top="0" tabpos="0"> + <File name="../../engines/sky/text.h" open="0" top="0" tabpos="0"> <Cursor position="1164" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/sword1.layout b/dists/codeblocks/sword1.layout index 64d7170963..faba849670 100644 --- a/dists/codeblocks/sword1.layout +++ b/dists/codeblocks/sword1.layout @@ -1,58 +1,58 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\sword1\animation.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/sword1/animation.cpp" open="0" top="0" tabpos="0"> <Cursor position="1143" topLine="0" /> </File> - <File name="..\..\engines\sword1\control.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/control.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="0" /> </File> - <File name="..\..\engines\sword1\credits.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/credits.cpp" open="0" top="0" tabpos="0"> <Cursor position="1136" topLine="0" /> </File> - <File name="..\..\engines\sword1\debug.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/debug.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\sword1\eventman.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/eventman.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="0" /> </File> - <File name="..\..\engines\sword1\logic.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/logic.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\sword1\memman.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/memman.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\sword1\menu.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/menu.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="0" /> </File> - <File name="..\..\engines\sword1\mouse.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/mouse.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\sword1\music.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/music.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\sword1\objectman.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/objectman.cpp" open="0" top="0" tabpos="0"> <Cursor position="1140" topLine="0" /> </File> - <File name="..\..\engines\sword1\resman.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/resman.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\sword1\router.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/router.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\sword1\screen.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/screen.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\sword1\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\sword1\staticres.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/staticres.cpp" open="0" top="0" tabpos="0"> <Cursor position="1139" topLine="0" /> </File> - <File name="..\..\engines\sword1\sword1.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/sword1.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\sword1\text.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword1/text.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/sword2.layout b/dists/codeblocks/sword2.layout index b23386af49..2ff9d84bcc 100644 --- a/dists/codeblocks/sword2.layout +++ b/dists/codeblocks/sword2.layout @@ -1,97 +1,97 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\sword2\animation.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/sword2/animation.cpp" open="0" top="0" tabpos="0"> <Cursor position="1240" topLine="0" /> </File> - <File name="..\..\engines\sword2\anims.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/anims.cpp" open="0" top="0" tabpos="0"> <Cursor position="1486" topLine="0" /> </File> - <File name="..\..\engines\sword2\console.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/console.cpp" open="0" top="0" tabpos="0"> <Cursor position="1233" topLine="0" /> </File> - <File name="..\..\engines\sword2\controls.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/controls.cpp" open="0" top="0" tabpos="0"> <Cursor position="1235" topLine="0" /> </File> - <File name="..\..\engines\sword2\debug.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/debug.cpp" open="0" top="0" tabpos="0"> <Cursor position="1229" topLine="0" /> </File> - <File name="..\..\engines\sword2\events.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/events.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\function.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/function.cpp" open="0" top="0" tabpos="0"> <Cursor position="1235" topLine="0" /> </File> - <File name="..\..\engines\sword2\icons.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/icons.cpp" open="0" top="0" tabpos="0"> <Cursor position="1229" topLine="0" /> </File> - <File name="..\..\engines\sword2\interpreter.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/interpreter.cpp" open="0" top="0" tabpos="0"> <Cursor position="1241" topLine="0" /> </File> - <File name="..\..\engines\sword2\layers.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/layers.cpp" open="0" top="0" tabpos="0"> <Cursor position="1442" topLine="0" /> </File> - <File name="..\..\engines\sword2\logic.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/logic.cpp" open="0" top="0" tabpos="0"> <Cursor position="1229" topLine="0" /> </File> - <File name="..\..\engines\sword2\maketext.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/maketext.cpp" open="0" top="0" tabpos="0"> <Cursor position="2066" topLine="3" /> </File> - <File name="..\..\engines\sword2\memory.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/memory.cpp" open="0" top="0" tabpos="0"> <Cursor position="2481" topLine="8" /> </File> - <File name="..\..\engines\sword2\menu.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/menu.cpp" open="0" top="0" tabpos="0"> <Cursor position="1227" topLine="0" /> </File> - <File name="..\..\engines\sword2\mouse.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/mouse.cpp" open="0" top="0" tabpos="0"> <Cursor position="1229" topLine="0" /> </File> - <File name="..\..\engines\sword2\music.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/music.cpp" open="0" top="0" tabpos="0"> <Cursor position="1532" topLine="0" /> </File> - <File name="..\..\engines\sword2\palette.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/palette.cpp" open="0" top="0" tabpos="0"> <Cursor position="1233" topLine="0" /> </File> - <File name="..\..\engines\sword2\protocol.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/protocol.cpp" open="0" top="0" tabpos="0"> <Cursor position="1235" topLine="0" /> </File> - <File name="..\..\engines\sword2\render.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/render.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\resman.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/resman.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\router.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/router.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\saveload.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/saveload.cpp" open="0" top="0" tabpos="0"> <Cursor position="1545" topLine="0" /> </File> - <File name="..\..\engines\sword2\screen.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/screen.cpp" open="0" top="0" tabpos="0"> <Cursor position="1467" topLine="0" /> </File> - <File name="..\..\engines\sword2\scroll.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/scroll.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\sound.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/sound.cpp" open="0" top="0" tabpos="0"> <Cursor position="1549" topLine="0" /> </File> - <File name="..\..\engines\sword2\speech.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/speech.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\sprite.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/sprite.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\startup.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/startup.cpp" open="0" top="0" tabpos="0"> <Cursor position="1233" topLine="0" /> </File> - <File name="..\..\engines\sword2\sword2.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/sword2.cpp" open="0" top="0" tabpos="0"> <Cursor position="1231" topLine="0" /> </File> - <File name="..\..\engines\sword2\sync.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/sync.cpp" open="0" top="0" tabpos="0"> <Cursor position="1227" topLine="0" /> </File> - <File name="..\..\engines\sword2\walker.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/sword2/walker.cpp" open="0" top="0" tabpos="0"> <Cursor position="1348" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/dists/codeblocks/touche.layout b/dists/codeblocks/touche.layout index 77af9ab8f9..abf0b73683 100644 --- a/dists/codeblocks/touche.layout +++ b/dists/codeblocks/touche.layout @@ -1,31 +1,31 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <CodeBlocks_layout_file> - <ActiveTarget name="" /> - <File name="..\..\engines\touche\detection.cpp" open="0" top="0" tabpos="0"> + <ActiveTarget name="default" /> + <File name="../../engines/touche/detection.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\touche\graphics.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/graphics.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="4" /> </File> - <File name="..\..\engines\touche\midi.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/midi.cpp" open="0" top="0" tabpos="0"> <Cursor position="1122" topLine="4" /> </File> - <File name="..\..\engines\touche\opcodes.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/opcodes.cpp" open="0" top="0" tabpos="0"> <Cursor position="1130" topLine="4" /> </File> - <File name="..\..\engines\touche\resource.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/resource.cpp" open="0" top="0" tabpos="0"> <Cursor position="1132" topLine="0" /> </File> - <File name="..\..\engines\touche\saveload.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/saveload.cpp" open="0" top="0" tabpos="0"> <Cursor position="1138" topLine="0" /> </File> - <File name="..\..\engines\touche\staticres.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/staticres.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\touche\touche.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/touche.cpp" open="0" top="0" tabpos="0"> <Cursor position="1134" topLine="0" /> </File> - <File name="..\..\engines\touche\ui.cpp" open="0" top="0" tabpos="0"> + <File name="../../engines/touche/ui.cpp" open="0" top="0" tabpos="0"> <Cursor position="1126" topLine="0" /> </File> </CodeBlocks_layout_file> diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 81aec3e351..9d88dd73ef 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -62,9 +62,7 @@ void AgiEngine::processEvents() { while (_eventMan->pollEvent(event)) { switch (event.type) { case Common::EVENT_QUIT: - _gfx->deinitVideo(); - _gfx->deinitMachine(); - _system->quit(); + _game.quitProgNow = true; break; case Common::EVENT_PREDICTIVE_DIALOG: if (_predictiveDialogRunning) @@ -766,12 +764,15 @@ AgiEngine::~AgiEngine() { } agiDeinit(); + delete _loader; _sound->deinitSound(); delete _sound; _gfx->deinitVideo(); delete _sprites; + delete _picture; free(_game.sbufOrig); _gfx->deinitMachine(); + delete _gfx; delete _rnd; delete _console; diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 9b22240f83..7880d407b8 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -96,6 +96,8 @@ AGOSEngine::AGOSEngine(OSystem *syst) _vc_get_out_of_code = 0; _gameOffsetsPtr = 0; + _quit = false; + _debugger = 0; _gameFile = 0; @@ -556,14 +558,17 @@ int AGOSEngine::init() { // Setup midi driver int midiDriver = MidiDriver::detectMusicDriver(MDT_ADLIB | MDT_MIDI); _nativeMT32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); - MidiDriver *driver = MidiDriver::createMidi(midiDriver); + + _driver = MidiDriver::createMidi(midiDriver); + if (_nativeMT32) { - driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); + _driver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE); } _midi.mapMT32toGM (getGameType() != GType_SIMON2 && !_nativeMT32); - _midi.setDriver(driver); + _midi.setDriver(_driver); + int ret = _midi.open(); if (ret) warning("MIDI Player init failed: \"%s\"", _midi.getErrorName (ret)); @@ -875,6 +880,7 @@ AGOSEngine::~AGOSEngine() { delete _gameFile; _midi.close(); + delete _driver; for (uint i = 0; i < _itemHeap.size(); i++) { delete[] _itemHeap[i]; @@ -883,6 +889,8 @@ AGOSEngine::~AGOSEngine() { free(_tablesHeapPtr - _tablesHeapCurPos); + free(_mouseData); + free(_gameOffsetsPtr); free(_iconFilePtr); free(_itemArrayPtr); @@ -894,6 +902,7 @@ AGOSEngine::~AGOSEngine() { free(_backGroundBuf); free(_backBuf); free(_scaleBuf); + free(_zoneBuffers); free(_window4BackScn); free(_window6BackScn); @@ -937,7 +946,7 @@ void AGOSEngine::pauseEngineIntern(bool pauseIt) { void AGOSEngine::pause() { pauseEngine(true); - while (_pause) { + while (_pause && !_quit) { delay(1); if (_keyPressed.keycode == Common::KEYCODE_p) pauseEngine(false); @@ -974,7 +983,7 @@ int AGOSEngine::go() { (getFeatures() & GF_DEMO)) { int i; - while (1) { + while (!_quit) { for (i = 0; i < 4; i++) { setWindowImage(3, 9902 + i); debug(0, "Displaying image %d", 9902 + i); @@ -1003,7 +1012,7 @@ int AGOSEngine::go() { runSubroutine101(); permitInput(); - while (1) { + while (!_quit) { waitForInput(); handleVerbClicked(_verbHitArea); delay(100); @@ -1012,6 +1021,9 @@ int AGOSEngine::go() { return 0; } + +/* I do not think that this will be used + * void AGOSEngine::shutdown() { // Sync with AGOSEngine::~AGOSEngine() // In Simon 2, this gets deleted along with _sound further down @@ -1019,6 +1031,7 @@ void AGOSEngine::shutdown() { delete _gameFile; _midi.close(); + delete _driver; for (uint i = 0; i < _itemHeap.size(); i++) { delete[] _itemHeap[i]; @@ -1058,6 +1071,7 @@ void AGOSEngine::shutdown() { _system->quit(); } +*/ uint32 AGOSEngine::getTime() const { // FIXME: calling time() is not portable, use OSystem::getMillis instead diff --git a/engines/agos/agos.h b/engines/agos/agos.h index 448d26a9d0..74a0b026e9 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -269,6 +269,7 @@ protected: uint16 _marks; + bool _quit; bool _scriptVar2; bool _runScriptReturn1; bool _runScriptCondition[40]; @@ -523,6 +524,7 @@ protected: byte _lettersToPrintBuf[80]; MidiPlayer _midi; + MidiDriver *_driver; bool _midiEnabled; bool _nativeMT32; diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp index 737f5317af..d38a5ad33b 100644 --- a/engines/agos/draw.cpp +++ b/engines/agos/draw.cpp @@ -473,7 +473,7 @@ void AGOSEngine::restoreBackGround() { animTable = animTableTmp = _screenAnim1; while (animTable->srcPtr) { if (!(animTable->windowNum & 0x8000)) { - memcpy(animTableTmp, animTable, sizeof(AnimTable)); + memmove(animTableTmp, animTable, sizeof(AnimTable)); animTableTmp++; } animTable++; diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 250ff2fcfd..010b331cf8 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -142,7 +142,7 @@ bool AGOSEngine::kickoffTimeEvents() { cur_time = getTime() - _gameStoppedClock; - while ((te = _firstTimeStruct) != NULL && te->time <= cur_time) { + while ((te = _firstTimeStruct) != NULL && te->time <= cur_time && !_quit) { result = true; _pendingDeleteTimeEvent = te; invokeTimeEvent(te); @@ -521,7 +521,7 @@ void AGOSEngine::delay(uint amount) { _rightButtonDown++; break; case Common::EVENT_QUIT: - shutdown(); + _quit = true; return; default: break; @@ -544,7 +544,7 @@ void AGOSEngine::delay(uint amount) { _system->delayMillis(this_delay); cur = _system->getMillis(); - } while (cur < start + amount); + } while (cur < start + amount && !_quit); } void AGOSEngine::timer_callback() { diff --git a/engines/agos/gfx.cpp b/engines/agos/gfx.cpp index 193b7347d6..c014413bdc 100644 --- a/engines/agos/gfx.cpp +++ b/engines/agos/gfx.cpp @@ -1263,7 +1263,7 @@ void AGOSEngine::setWindowImageEx(uint16 mode, uint16 vga_res) { if (getGameType() == GType_WW && (mode == 6 || mode == 8 || mode == 9)) { setWindowImage(mode, vga_res); } else { - while (_copyScnFlag) + while (_copyScnFlag && !_quit) delay(1); setWindowImage(mode, vga_res); diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index add7eb96f0..d36549f187 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -189,12 +189,12 @@ void AGOSEngine::waitForInput() { resetVerbs(); } - for (;;) { + while (!_quit) { _lastHitArea = NULL; _lastHitArea3 = NULL; _dragAccept = 1; - for (;;) { + while (!_quit) { if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) && _keyPressed.keycode == Common::KEYCODE_F10) displayBoxStars(); diff --git a/engines/agos/intern.h b/engines/agos/intern.h index 54cf4dba16..4479e2851e 100644 --- a/engines/agos/intern.h +++ b/engines/agos/intern.h @@ -161,6 +161,7 @@ struct WindowBlock { uint8 fill_color, text_color; IconBlock *iconPtr; WindowBlock() { memset(this, 0, sizeof(*this)); } + ~WindowBlock() { free (iconPtr); } }; // note on text offset: // the actual x-coordinate is: textColumn * 8 + textColumnOffset diff --git a/engines/agos/script.cpp b/engines/agos/script.cpp index 44fbb4e9e0..6758aec511 100644 --- a/engines/agos/script.cpp +++ b/engines/agos/script.cpp @@ -410,7 +410,7 @@ void AGOSEngine::o_msg() { void AGOSEngine::o_end() { // 68: exit interpreter - shutdown(); + _quit = true; } void AGOSEngine::o_done() { @@ -965,6 +965,9 @@ void AGOSEngine::writeVariable(uint16 variable, uint16 contents) { int AGOSEngine::runScript() { bool flag; + if (_quit) + return 1; + do { if (_continousMainScript) dumpOpcode(_codePtr); @@ -1007,7 +1010,7 @@ int AGOSEngine::runScript() { error("Invalid opcode '%d' encountered", _opcode); executeOpcode(_opcode); - } while (getScriptCondition() != flag && !getScriptReturn()); + } while (getScriptCondition() != flag && !getScriptReturn() && !_quit); return getScriptReturn(); } @@ -1063,7 +1066,7 @@ void AGOSEngine::waitForSync(uint a) { _exitCutscene = false; _rightButtonDown = false; - while (_vgaWaitFor != 0) { + while (_vgaWaitFor != 0 && !_quit) { if (_rightButtonDown) { if (_vgaWaitFor == 200 && (getGameType() == GType_FF || !getBitFlag(14))) { skipSpeech(); diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index 94df21979c..c7e1d6736e 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -565,7 +565,7 @@ void AGOSEngine_Elvira1::oe1_look() { lobjFunc(l, "You can see "); /* Show objects */ } if (r && (r->flags & 4) && levelOf(i) < 10000) { - shutdown(); + _quit = true; } } @@ -944,7 +944,7 @@ restart: windowPutChar(window, *message2); if (confirmYesOrNo(120, 62) == 0x7FFF) { - shutdown(); + _quit = true; } else { goto restart; } diff --git a/engines/agos/script_s1.cpp b/engines/agos/script_s1.cpp index a1308b951d..51918b9515 100644 --- a/engines/agos/script_s1.cpp +++ b/engines/agos/script_s1.cpp @@ -345,14 +345,14 @@ void AGOSEngine_Simon1::os1_pauseGame() { if (isSmartphone()) { if (_keyPressed.keycode) { if (_keyPressed.keycode == Common::KEYCODE_RETURN) - shutdown(); + _quit = true; else break; } } #endif if (_keyPressed.keycode == keyYes) - shutdown(); + _quit = true; else if (_keyPressed.keycode == keyNo) break; } diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp index 44ada82585..cb71ed7efa 100644 --- a/engines/agos/subroutine.cpp +++ b/engines/agos/subroutine.cpp @@ -554,6 +554,10 @@ int AGOSEngine::startSubroutine(Subroutine *sub) { _currentTable = sub; restart: + + if (_quit) + return result; + while ((byte *)sl != (byte *)sub) { _currentLine = sl; if (checkIfToRunSubroutineLine(sl, sub)) { diff --git a/engines/cine/cine.cpp b/engines/cine/cine.cpp index efc33fadaf..6cf9e2fb26 100644 --- a/engines/cine/cine.cpp +++ b/engines/cine/cine.cpp @@ -42,7 +42,6 @@ #include "cine/sound.h" #include "cine/various.h" - namespace Cine { Sound *g_sound; @@ -70,6 +69,9 @@ CineEngine::~CineEngine() { freeErrmessDat(); } Common::clearAllSpecialDebugLevels(); + + free(partBuffer); + free(textDataPtr); } int CineEngine::init() { diff --git a/engines/cine/main_loop.cpp b/engines/cine/main_loop.cpp index cfb828cf3c..0c5096c0d6 100644 --- a/engines/cine/main_loop.cpp +++ b/engines/cine/main_loop.cpp @@ -186,6 +186,7 @@ void CineEngine::mainLoop(int bootScriptIdx) { uint16 mouseButton; quitFlag = 0; + exitEngine = 0; if (_preLoad == false) { resetBgIncrustList(); diff --git a/engines/cine/sound.cpp b/engines/cine/sound.cpp index e808de6922..f26032fe98 100644 --- a/engines/cine/sound.cpp +++ b/engines/cine/sound.cpp @@ -249,6 +249,7 @@ AdlibSoundDriver::AdlibSoundDriver(Audio::Mixer *mixer) AdlibSoundDriver::~AdlibSoundDriver() { _mixer->stopHandle(_soundHandle); + OPLDestroy(_opl); } void AdlibSoundDriver::setupChannel(int channel, const byte *data, int instrument, int volume) { diff --git a/engines/lure/lure.cpp b/engines/lure/lure.cpp index 06d3b1984e..fa6323af07 100644 --- a/engines/lure/lure.cpp +++ b/engines/lure/lure.cpp @@ -164,10 +164,14 @@ void LureEngine::pauseEngineIntern(bool pause) { } } +/* This is not being used + void LureEngine::quitGame() { _system->quit(); } +*/ + const char *LureEngine::generateSaveName(int slotNumber) { static char buffer[15]; diff --git a/engines/lure/lure.h b/engines/lure/lure.h index d66f446247..b4cec38ef3 100644 --- a/engines/lure/lure.h +++ b/engines/lure/lure.h @@ -70,7 +70,7 @@ public: virtual int init(); virtual int go(); virtual void pauseEngineIntern(bool pause); - void quitGame(); + //void quitGame(); This is not being used Disk &disk() { return *_disk; } diff --git a/engines/lure/menu.cpp b/engines/lure/menu.cpp index cecc415499..0b4ef06081 100644 --- a/engines/lure/menu.cpp +++ b/engines/lure/menu.cpp @@ -57,6 +57,11 @@ MenuRecord::MenuRecord(const MenuRecordBounds *bounds, int numParams, ...) { _width = (bounds->contentsWidth + 3) << 3; } +MenuRecord::~MenuRecord() { + free(_entries); + _entries = NULL; +} + const char *MenuRecord::getEntry(uint8 index) { if (index >= _numEntries) error("Invalid menuitem index specified: %d", index); return _entries[index]; diff --git a/engines/lure/menu.h b/engines/lure/menu.h index b5b7769e34..fcc6308375 100644 --- a/engines/lure/menu.h +++ b/engines/lure/menu.h @@ -56,6 +56,7 @@ private: uint8 _numEntries; public: MenuRecord(const MenuRecordBounds *bounds, int numParams, ...); + ~MenuRecord(); uint16 xstart() { return _xstart; } uint16 width() { return _width; } diff --git a/engines/lure/palette.cpp b/engines/lure/palette.cpp index 03161032c0..badc3c96b0 100644 --- a/engines/lure/palette.cpp +++ b/engines/lure/palette.cpp @@ -106,6 +106,12 @@ Palette::Palette(uint16 resourceId, PaletteSource paletteSource) { delete srcData; } +// Destructor + +Palette::~Palette() { + delete _palette; +} + void Palette::convertRgb64Palette(const byte *srcPalette, uint16 srcNumEntries) { byte *pDest = _palette->data(); const byte *pSrc = srcPalette; diff --git a/engines/lure/palette.h b/engines/lure/palette.h index 1481e22775..9420079346 100644 --- a/engines/lure/palette.h +++ b/engines/lure/palette.h @@ -46,6 +46,7 @@ public: Palette(uint16 srcNumEntries, const byte *srcData, PaletteSource paletteSource); Palette(Palette &src); Palette(uint16 resourceId, PaletteSource paletteSource = DEFAULT); + ~Palette(); uint8 *data() { return _palette->data(); } MemoryBlock *palette() { return _palette; } diff --git a/engines/lure/res.cpp b/engines/lure/res.cpp index f2997d5d17..68de260061 100644 --- a/engines/lure/res.cpp +++ b/engines/lure/res.cpp @@ -349,6 +349,7 @@ void Resources::reloadData() { _indexedRoomExitHospots.push_back(RoomExitIndexedHotspotList::value_type(new RoomExitIndexedHotspotData(indexedRec))); indexedRec++; } + delete mb; // Initialise delay list _delayList.clear(true); diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp index 70db637699..b9dea60dc0 100644 --- a/engines/parallaction/dialogue.cpp +++ b/engines/parallaction/dialogue.cpp @@ -105,10 +105,8 @@ uint16 DialogueManager::askPassword() { if (g_system->getEventManager()->pollEvent(e)) { if (e.type == Common::EVENT_QUIT) { - // TODO: don't quit() here, just have caller routines to check - // on kEngineQuit and exit gracefully to allow the engine to shut down _engineFlags |= kEngineQuit; - g_system->quit(); + break; } if ((e.type == Common::EVENT_KEYDOWN) && isdigit(e.kbd.ascii)) { @@ -231,11 +229,19 @@ void DialogueManager::run() { answer = 0; displayQuestion(); + + if (_engineFlags & kEngineQuit) + return; + if (_q->_answers[0] == NULL) break; if (scumm_stricmp(_q->_answers[0]->_text, "NULL")) { if (!displayAnswers()) break; answer = getAnswer(); + + if (_engineFlags & kEngineQuit) + return; + cmdlist = &_q->_answers[answer]->_commands; } @@ -266,7 +272,7 @@ int16 DialogueManager::selectAnswer() { uint32 event; Common::Point p; - while (true) { + while (_engineFlags & kEngineQuit == 0) { _vm->_input->readInput(); _vm->_input->getCursorPos(p); diff --git a/engines/parallaction/exec_ns.cpp b/engines/parallaction/exec_ns.cpp index a4b372f42a..bd2d54c0a0 100644 --- a/engines/parallaction/exec_ns.cpp +++ b/engines/parallaction/exec_ns.cpp @@ -519,6 +519,8 @@ uint16 Parallaction::runZone(ZonePtr z) { case kZoneSpeak: runDialogue(z->u.speak); + if (_engineFlags & kEngineQuit) + return 0; break; } diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h index 894e0fd678..f03b8538b8 100644 --- a/engines/parallaction/graphics.h +++ b/engines/parallaction/graphics.h @@ -95,6 +95,7 @@ public: } ~SurfaceToFrames() { + _surf->free(); delete _surf; } diff --git a/engines/parallaction/input.cpp b/engines/parallaction/input.cpp index 28d0ad888d..e758bbd41c 100644 --- a/engines/parallaction/input.cpp +++ b/engines/parallaction/input.cpp @@ -80,11 +80,8 @@ uint16 Input::readInput() { break; case Common::EVENT_QUIT: - // TODO: don't quit() here, just have caller routines to check - // on kEngineQuit and exit gracefully to allow the engine to shut down _engineFlags |= kEngineQuit; - _vm->_system->quit(); - break; + return KeyDown; default: break; diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index d66b1af1f1..25ebe4263d 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -84,21 +84,23 @@ Parallaction::Parallaction(OSystem *syst, const PARALLACTIONGameDescription *gam Parallaction::~Parallaction() { + clearSet(_commandOpcodes); + clearSet(_instructionOpcodes); + delete _debugger; - delete _globalTable; - delete _callableNames; - delete _localFlagNames; freeLocation(); freeCharacter(); destroyInventory(); - + + delete _localFlagNames; delete _gfx; delete _soundMan; delete _disk; + delete _input; } @@ -136,9 +138,11 @@ int Parallaction::init() { } - - - +void Parallaction::clearSet(OpcodeSet &opcodes) { + for (Common::Array<const Opcode*>::iterator i = opcodes.begin(); i != opcodes.end(); ++i) + delete *i; + opcodes.clear(); +} void Parallaction::updateView() { @@ -354,12 +358,20 @@ void Parallaction::runGame() { processInput(data); } + if (_engineFlags & kEngineQuit) + return; + runPendingZones(); + if (_engineFlags & kEngineQuit) + return; + if (_engineFlags & kEngineChangeLocation) { changeLocation(_location._name); } + if (_engineFlags & kEngineQuit) + return; _gfx->beginFrame(); @@ -522,11 +534,12 @@ void Character::free() { delete _talk; delete _head; delete _objs; + delete _ani->gfxobj; - _ani->gfxobj = NULL; _talk = NULL; _head = NULL; _objs = NULL; + _ani->gfxobj = NULL; return; } diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 6e5957d3cd..5ae1386378 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -385,6 +385,9 @@ protected: // members int16 pickupItem(ZonePtr z); + void clearSet(OpcodeSet &opcodes); + + public: virtual void callFunction(uint index, void* parm) { } @@ -401,6 +404,7 @@ public: void beep(); + public: // const char **_zoneFlagNamesRes; // const char **_zoneTypeNamesRes; diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index 0f5cc2a0c4..b22e1b0f2d 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -109,6 +109,9 @@ int Parallaction_br::go() { guiStart(); + if (_engineFlags & kEngineQuit) + return 0; + // initCharacter(); _input->_inputMode = Input::kInputModeGame; diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 2cca3a6a4a..f346a278f7 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -156,7 +156,9 @@ int Parallaction_ns::init() { Parallaction_ns::~Parallaction_ns() { freeFonts(); - + + delete _locationParser; + delete _programParser; delete _mouseComposedArrow; _location._animations.remove(_char._ani); @@ -233,9 +235,15 @@ int Parallaction_ns::go() { _globalTable = _disk->loadTable("global"); guiStart(); - + + if (_engineFlags & kEngineQuit) + return 0; + changeLocation(_location._name); + if (_engineFlags & kEngineQuit) + return 0; + _input->_inputMode = Input::kInputModeGame; while ((_engineFlags & kEngineQuit) == 0) { runGame(); diff --git a/engines/parallaction/parser.cpp b/engines/parallaction/parser.cpp index f9de6eb4af..6de0a7d7f5 100644 --- a/engines/parallaction/parser.cpp +++ b/engines/parallaction/parser.cpp @@ -30,8 +30,7 @@ namespace Parallaction { char _tokens[20][MAX_TOKEN_LEN]; -Script::Script(Common::ReadStream *input, bool disposeSource) : _input(input), _disposeSource(disposeSource), _line(0) { -} +Script::Script(Common::ReadStream *input, bool disposeSource) : _input(input), _disposeSource(disposeSource), _line(0) {} Script::~Script() { if (_disposeSource) diff --git a/engines/parallaction/parser.h b/engines/parallaction/parser.h index d488cf9b58..1541fb89b2 100644 --- a/engines/parallaction/parser.h +++ b/engines/parallaction/parser.h @@ -221,13 +221,14 @@ public: virtual void init(); virtual ~LocationParser_ns() { + delete _parser; delete _commandsNames; delete _locationStmt; + delete _locationZoneStmt; + delete _locationAnimStmt; delete _zoneTypeNames; delete _zoneFlagNames; - delete _parser; - clearSet(_commandParsers); clearSet(_locationAnimParsers); clearSet(_locationZoneParsers); @@ -356,7 +357,9 @@ public: virtual void init(); virtual ~ProgramParser_ns() { + delete _parser; delete _instructionNames; + clearSet(_instructionParsers); } diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp index 2c4601c938..c654e3008e 100644 --- a/engines/parallaction/parser_ns.cpp +++ b/engines/parallaction/parser_ns.cpp @@ -1397,7 +1397,7 @@ void LocationParser_ns::parseZone(ZoneList &list, char *name) { list.push_front(z); _parser->pushTables(&_locationZoneParsers, _locationZoneStmt); - + return; } diff --git a/engines/queen/input.cpp b/engines/queen/input.cpp index 146e95bcef..9f03c341c9 100644 --- a/engines/queen/input.cpp +++ b/engines/queen/input.cpp @@ -27,6 +27,7 @@ #include "common/events.h" #include "common/system.h" +#include "queen/queen.h" #include "queen/input.h" namespace Queen { @@ -51,12 +52,12 @@ const Verb Input::_verbKeys[] = { VERB_USE }; -Input::Input(Common::Language language, OSystem *system) : +Input::Input(Common::Language language, OSystem *system, QueenEngine *vm) : _system(system), _eventMan(system->getEventManager()), _fastMode(false), _keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false), _cutawayQuit(false), _dialogueRunning(false), _talkQuit(false), _quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID), - _mouseButton(0), _idleTime(0) { + _mouseButton(0), _idleTime(0) , _vm(vm) { switch (language) { case Common::EN_ANY: @@ -119,8 +120,8 @@ void Input::delay(uint amount) { break; case Common::EVENT_QUIT: - _system->quit(); - break; + _vm->quitGame(); + return; default: break; diff --git a/engines/queen/input.h b/engines/queen/input.h index 86092aeed6..43a57729c6 100644 --- a/engines/queen/input.h +++ b/engines/queen/input.h @@ -49,7 +49,7 @@ public: MOUSE_RBUTTON = 2 }; - Input(Common::Language language, OSystem *system); + Input(Common::Language language, OSystem *system, QueenEngine *vm); void delay(uint amount); @@ -99,6 +99,8 @@ private: Common::EventManager *_eventMan; + QueenEngine *_vm; + //! some cutaways require update() run faster bool _fastMode; diff --git a/engines/queen/journal.cpp b/engines/queen/journal.cpp index bfbcfa4e59..0327fb74b8 100644 --- a/engines/queen/journal.cpp +++ b/engines/queen/journal.cpp @@ -85,8 +85,8 @@ void Journal::use() { handleMouseWheel(1); break; case Common::EVENT_QUIT: - _system->quit(); - break; + _vm->quitGame(); + return; default: break; } diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index d1a1247c46..c95e44b477 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -418,7 +418,7 @@ int QueenEngine::init() { _display = new Display(this, _system); _graphics = new Graphics(this); _grid = new Grid(this); - _input = new Input(_resource->getLanguage(), _system); + _input = new Input(_resource->getLanguage(), _system, this); if (_resource->isDemo()) { _logic = new LogicDemo(this); diff --git a/engines/sky/music/adlibmusic.cpp b/engines/sky/music/adlibmusic.cpp index 7c2b262d82..4434f4cd68 100644 --- a/engines/sky/music/adlibmusic.cpp +++ b/engines/sky/music/adlibmusic.cpp @@ -47,6 +47,7 @@ AdlibMusic::AdlibMusic(Audio::Mixer *pMixer, Disk *pDisk) AdlibMusic::~AdlibMusic(void) { + OPLDestroy(_opl); _mixer->stopHandle(_soundHandle); } diff --git a/engines/touche/midi.cpp b/engines/touche/midi.cpp index 14cb85912a..ce62849d2f 100644 --- a/engines/touche/midi.cpp +++ b/engines/touche/midi.cpp @@ -107,6 +107,7 @@ void MidiPlayer::close() { _mutex.lock(); _driver->setTimerCallback(NULL, NULL); _driver->close(); + delete _driver; _driver = 0; _parser->setMidiDriver(NULL); delete _parser; diff --git a/engines/touche/touche.cpp b/engines/touche/touche.cpp index 6520fb5e4a..06ee28dae8 100644 --- a/engines/touche/touche.cpp +++ b/engines/touche/touche.cpp @@ -96,6 +96,7 @@ int ToucheEngine::init() { MidiDriver *driver = MidiDriver::createMidi(midiDriver); _midiPlayer = new MidiPlayer(driver, native_mt32); + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume")); _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume); diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp index ba7c6dee9b..fe5f653b94 100644 --- a/graphics/cursorman.cpp +++ b/graphics/cursorman.cpp @@ -83,6 +83,24 @@ void CursorManager::popCursor() { g_system->showMouse(isVisible()); } + +void CursorManager::popAllCursors() { + while (!_cursorStack.empty()) { + Cursor *cur = _cursorStack.pop(); + delete cur; + } + + if (g_system->hasFeature(OSystem::kFeatureCursorHasPalette)) { + while (!_cursorPaletteStack.empty()) { + Palette *pal = _cursorPaletteStack.pop(); + delete pal; + } + } + + g_system->showMouse(isVisible()); +} + + void CursorManager::replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int targetScale) { if (_cursorStack.empty()) { pushCursor(buf, w, h, hotspotX, hotspotY, keycolor, targetScale); diff --git a/graphics/cursorman.h b/graphics/cursorman.h index 151038e118..bf05ab762b 100644 --- a/graphics/cursorman.h +++ b/graphics/cursorman.h @@ -80,6 +80,14 @@ public: void replaceCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int targetScale = 1); /** + * Pop all of the cursors and cursor palettes from their respective stacks. + * The purpose is to ensure that all unecessary cursors are removed from the + * stack when returning to the launcher from an engine. + * + */ + void popAllCursors(); + + /** * Enable/Disable the current cursor palette. * * @param disable diff --git a/graphics/iff.cpp b/graphics/iff.cpp index ac51531eee..514fba9cc0 100644 --- a/graphics/iff.cpp +++ b/graphics/iff.cpp @@ -139,6 +139,7 @@ void ILBMDecoder::readBODY(Common::IFFChunk& chunk) { out += _bitmapHeader.width; } + free(scan); break; } diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 0bf61d084f..ddb69853f1 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -364,7 +364,9 @@ void NewGui::restoreState() { void NewGui::openDialog(Dialog *dialog) { _dialogStack.push(dialog); _needRedraw = true; - + + CursorMan.popAllCursors(); + // We reflow the dialog just before opening it. If the screen changed // since the last time we looked, also refresh the loaded theme, // and reflow all other open dialogs, too. |