diff options
Diffstat (limited to 'engines/sci')
66 files changed, 114 insertions, 125 deletions
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp index 54ff61dab7..c932a1fe93 100644 --- a/engines/sci/engine/kernel.cpp +++ b/engines/sci/engine/kernel.cpp @@ -38,7 +38,7 @@ #include "sci/engine/gc.h" #include "sci/include/sciresource.h" #include "sci/include/engine.h" -#include "sci/include/gfx_operations.h" +#include "sci/gfx/gfx_operations.h" #include "sci/engine/kernel_types.h" namespace Sci { diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index ef90bc3231..540dfd3cf2 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -27,7 +27,7 @@ #include "sci/include/sciresource.h" #include "sci/include/engine.h" -#include "sci/include/gfx_widgets.h" +#include "sci/gfx/gfx_widgets.h" #include "sci/engine/sci_graphics.h" #include "sci/include/sci_widgets.h" diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 46ef7d03d1..02b3a21dca 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -24,7 +24,7 @@ */ #include "sci/include/engine.h" -#include "sci/include/sfx_player.h" +#include "sci/sfx/sfx_player.h" namespace Sci { diff --git a/engines/sci/engine/savegame.cfsml b/engines/sci/engine/savegame.cfsml index 97083e5625..275eb43bf5 100644 --- a/engines/sci/engine/savegame.cfsml +++ b/engines/sci/engine/savegame.cfsml @@ -32,8 +32,8 @@ #include <stdarg.h> #include <time.h> // FIXME: For struct tm #include "sci/include/sci_memory.h" -#include "sci/include/gfx_operations.h" -#include "sci/include/sfx_engine.h" +#include "sci/gfx/gfx_operations.h" +#include "sci/sfx/sfx_engine.h" #include "sci/include/engine.h" #include "sci/engine/heap.h" #include "common/stream.h" diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp index bc77dfb9d9..dd546145bc 100644 --- a/engines/sci/engine/savegame.cpp +++ b/engines/sci/engine/savegame.cpp @@ -32,8 +32,8 @@ #include <stdarg.h> #include <time.h> // FIXME: For struct tm #include "sci/include/sci_memory.h" -#include "sci/include/gfx_operations.h" -#include "sci/include/sfx_engine.h" +#include "sci/gfx/gfx_operations.h" +#include "sci/sfx/sfx_engine.h" #include "sci/include/engine.h" #include "sci/engine/heap.h" #include "common/stream.h" diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index 886a1f5d37..b92335cb8b 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -32,7 +32,7 @@ #include "sci/engine/kernel_types.h" #include "sci/engine/seg_manager.h" #include "sci/engine/gc.h" -#include "sci/include/sfx_player.h" +#include "sci/sfx/sfx_player.h" #ifdef HAVE_SETJMP_H #include <setjmp.h> diff --git a/engines/sci/gfx/antialias.cpp b/engines/sci/gfx/antialias.cpp index e7bf190d23..fac1aa3a5e 100644 --- a/engines/sci/gfx/antialias.cpp +++ b/engines/sci/gfx/antialias.cpp @@ -25,8 +25,8 @@ /** Antialiasing code **/ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/gfx/font-5x8.cpp b/engines/sci/gfx/font-5x8.cpp index 7e446b8363..10ee35db06 100644 --- a/engines/sci/gfx/font-5x8.cpp +++ b/engines/sci/gfx/font-5x8.cpp @@ -1,6 +1,6 @@ /* Auto-generated by bdftofont.c */ -#include "sci/include/gfx_system.h" +#include "sci/gfx/gfx_system.h" namespace Sci { diff --git a/engines/sci/gfx/font-6x10.cpp b/engines/sci/gfx/font-6x10.cpp index 390bc5c7fa..1cb5cb6c4b 100644 --- a/engines/sci/gfx/font-6x10.cpp +++ b/engines/sci/gfx/font-6x10.cpp @@ -1,6 +1,6 @@ /* Auto-generated by bdftofont.c */ -#include "sci/include/gfx_system.h" +#include "sci/gfx/gfx_system.h" namespace Sci { diff --git a/engines/sci/gfx/font.cpp b/engines/sci/gfx/font.cpp index c0326c749d..dcc140b948 100644 --- a/engines/sci/gfx/font.cpp +++ b/engines/sci/gfx/font.cpp @@ -24,9 +24,9 @@ */ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/gfx/gfx_driver.cpp b/engines/sci/gfx/gfx_driver.cpp index 6304abfd5e..6881f79e71 100644 --- a/engines/sci/gfx/gfx_driver.cpp +++ b/engines/sci/gfx/gfx_driver.cpp @@ -27,8 +27,8 @@ #include "common/system.h" #include "common/events.h" -#include "sci/include/gfx_driver.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_driver.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/include/gfx_driver.h b/engines/sci/gfx/gfx_driver.h index 21355eec6b..cb361a21bc 100644 --- a/engines/sci/include/gfx_driver.h +++ b/engines/sci/gfx/gfx_driver.h @@ -26,7 +26,7 @@ #ifndef _SCI_GFX_DRIVER_H_ #define _SCI_GFX_DRIVER_H_ -#include "sci/include/gfx_system.h" +#include "sci/gfx/gfx_system.h" #include "sci/include/uinput.h" namespace Sci { diff --git a/engines/sci/include/gfx_operations.h b/engines/sci/gfx/gfx_operations.h index 42342334a5..15090d22da 100644 --- a/engines/sci/include/gfx_operations.h +++ b/engines/sci/gfx/gfx_operations.h @@ -28,10 +28,10 @@ #ifndef _GFX_OPERATIONS_H_ #define _GFX_OPERATIONS_H_ -#include "sci/include/gfx_resmgr.h" -#include "sci/include/gfx_tools.h" -#include "sci/include/gfx_options.h" -#include "sci/include/gfx_system.h" +#include "sci/gfx/gfx_resmgr.h" +#include "sci/gfx/gfx_tools.h" +#include "sci/gfx/gfx_options.h" +#include "sci/gfx/gfx_system.h" #include "sci/include/uinput.h" namespace Sci { diff --git a/engines/sci/include/gfx_options.h b/engines/sci/gfx/gfx_options.h index 45c5efdd5c..d9abcbbfb2 100644 --- a/engines/sci/include/gfx_options.h +++ b/engines/sci/gfx/gfx_options.h @@ -27,9 +27,9 @@ #ifndef _GFX_OPTIONS_H_ #define _GFX_OPTIONS_H_ -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" -#include "sci/include/gfx_res_options.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" +#include "sci/gfx/gfx_res_options.h" namespace Sci { diff --git a/engines/sci/gfx/gfx_res_options.cpp b/engines/sci/gfx/gfx_res_options.cpp index 76f488f45e..f665b50141 100644 --- a/engines/sci/gfx/gfx_res_options.cpp +++ b/engines/sci/gfx/gfx_res_options.cpp @@ -23,9 +23,9 @@ * */ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_options.h" -#include "sci/include/gfx_resmgr.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_options.h" +#include "sci/gfx/gfx_resmgr.h" #include <ctype.h> diff --git a/engines/sci/include/gfx_res_options.h b/engines/sci/gfx/gfx_res_options.h index 7f857cbeeb..6532cb456f 100644 --- a/engines/sci/include/gfx_res_options.h +++ b/engines/sci/gfx/gfx_res_options.h @@ -28,8 +28,8 @@ #ifndef _GFX_RES_OPTIONS_H_ #define _GFX_RES_OPTIONS_H_ -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_resmgr.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_resmgr.h" namespace Sci { diff --git a/engines/sci/include/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 6ba34b8815..04455451f9 100644 --- a/engines/sci/include/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -30,8 +30,8 @@ // filenames, are misleading. This should be renamed to "Graphics manager" // or something like that. -#include "sci/include/gfx_resource.h" -#include "sci/include/sbtree.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/sbtree.h" namespace Sci { diff --git a/engines/sci/gfx/gfx_resource.cpp b/engines/sci/gfx/gfx_resource.cpp index 74c8f905f2..678f74ce83 100644 --- a/engines/sci/gfx/gfx_resource.cpp +++ b/engines/sci/gfx/gfx_resource.cpp @@ -23,9 +23,9 @@ * */ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/include/gfx_resource.h b/engines/sci/gfx/gfx_resource.h index d83e06b9c5..2ad69b821d 100644 --- a/engines/sci/include/gfx_resource.h +++ b/engines/sci/gfx/gfx_resource.h @@ -28,8 +28,8 @@ #ifndef _GFX_RESOURCE_H_ #define _GFX_RESOURCE_H_ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_driver.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_driver.h" namespace Sci { diff --git a/engines/sci/include/gfx_state_internal.h b/engines/sci/gfx/gfx_state_internal.h index f32c19988e..871a618303 100644 --- a/engines/sci/include/gfx_state_internal.h +++ b/engines/sci/gfx/gfx_state_internal.h @@ -26,11 +26,11 @@ #ifndef _GFX_STATE_INTERNAL_H_ #define _GFX_STATE_INTERNAL_H_ -#include "sci/include/gfx_tools.h" -#include "sci/include/gfx_options.h" -#include "sci/include/gfx_operations.h" -#include "sci/include/gfx_resmgr.h" -#include "sci/include/gfx_system.h" +#include "sci/gfx/gfx_tools.h" +#include "sci/gfx/gfx_options.h" +#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/gfx_resmgr.h" +#include "sci/gfx/gfx_system.h" namespace Sci { diff --git a/engines/sci/gfx/gfx_support.cpp b/engines/sci/gfx/gfx_support.cpp index e1b8004907..26acf988f5 100644 --- a/engines/sci/gfx/gfx_support.cpp +++ b/engines/sci/gfx/gfx_support.cpp @@ -27,8 +27,8 @@ ** for use with the graphical state manager */ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_tools.h" #define DRAWLINE_FUNC _gfx_draw_line_buffer_1 #define PIXELWIDTH 1 diff --git a/engines/sci/include/gfx_system.h b/engines/sci/gfx/gfx_system.h index 6aa2b98d2b..6aa2b98d2b 100644 --- a/engines/sci/include/gfx_system.h +++ b/engines/sci/gfx/gfx_system.h diff --git a/engines/sci/gfx/gfx_tools.cpp b/engines/sci/gfx/gfx_tools.cpp index 18d449d140..99232e55ab 100644 --- a/engines/sci/gfx/gfx_tools.cpp +++ b/engines/sci/gfx/gfx_tools.cpp @@ -24,7 +24,7 @@ */ #include "sci/include/sci_memory.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/include/gfx_tools.h b/engines/sci/gfx/gfx_tools.h index 09fdc3891d..b02e437c26 100644 --- a/engines/sci/include/gfx_tools.h +++ b/engines/sci/gfx/gfx_tools.h @@ -29,8 +29,8 @@ #ifndef _GFX_TOOLS_H_ #define _GFX_TOOLS_H_ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_driver.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_driver.h" namespace Sci { diff --git a/engines/sci/include/gfx_widgets.h b/engines/sci/gfx/gfx_widgets.h index 9f365a9959..1c853648a6 100644 --- a/engines/sci/include/gfx_widgets.h +++ b/engines/sci/gfx/gfx_widgets.h @@ -28,7 +28,7 @@ #ifndef _GFX_WIDGETS_H_ #define _GFX_WIDGETS_H_ -#include "sci/include/gfx_state_internal.h" +#include "sci/gfx/gfx_state_internal.h" namespace Sci { diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp index dbeeb38122..c4d6a9f471 100644 --- a/engines/sci/gfx/operations.cpp +++ b/engines/sci/gfx/operations.cpp @@ -26,7 +26,7 @@ // Graphical operations, called from the widget state manager #include "sci/include/sci_memory.h" -#include "sci/include/gfx_operations.h" +#include "sci/gfx/gfx_operations.h" #include <ctype.h> diff --git a/engines/sci/gfx/resmgr.cpp b/engines/sci/gfx/resmgr.cpp index 62f0493775..c722175b12 100644 --- a/engines/sci/gfx/resmgr.cpp +++ b/engines/sci/gfx/resmgr.cpp @@ -29,11 +29,11 @@ // filenames, are misleading. This should be renamed to "Graphics manager" // or something like that. -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" -#include "sci/include/gfx_driver.h" -#include "sci/include/gfx_resmgr.h" -#include "sci/include/gfx_state_internal.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" +#include "sci/gfx/gfx_driver.h" +#include "sci/gfx/gfx_resmgr.h" +#include "sci/gfx/gfx_state_internal.h" #include "common/system.h" diff --git a/engines/sci/gfx/resource/sci_cursor_0.cpp b/engines/sci/gfx/resource/sci_cursor_0.cpp index aa60fb4b7d..f231cb31f9 100644 --- a/engines/sci/gfx/resource/sci_cursor_0.cpp +++ b/engines/sci/gfx/resource/sci_cursor_0.cpp @@ -23,9 +23,9 @@ * */ -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/gfx/resource/sci_font.cpp b/engines/sci/gfx/resource/sci_font.cpp index 8b1eb4b8b2..a6d3abcb9d 100644 --- a/engines/sci/gfx/resource/sci_font.cpp +++ b/engines/sci/gfx/resource/sci_font.cpp @@ -24,9 +24,9 @@ */ #include "sci/include/sci_memory.h" -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/gfx/resource/sci_pal_1.cpp b/engines/sci/gfx/resource/sci_pal_1.cpp index 6ba33b5ae7..97280cef25 100644 --- a/engines/sci/gfx/resource/sci_pal_1.cpp +++ b/engines/sci/gfx/resource/sci_pal_1.cpp @@ -26,8 +26,8 @@ /* SCI1 palette resource defrobnicator */ #include "sci/include/sci_memory.h" -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_resource.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_resource.h" namespace Sci { diff --git a/engines/sci/gfx/resource/sci_pic_0.cpp b/engines/sci/gfx/resource/sci_pic_0.cpp index 8f0e311f7c..392996d4e5 100644 --- a/engines/sci/gfx/resource/sci_pic_0.cpp +++ b/engines/sci/gfx/resource/sci_pic_0.cpp @@ -25,8 +25,8 @@ #include <time.h> // for time() to seed rand() via srand() #include "sci/include/sci_memory.h" -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/gfx/resource/sci_picfill.cpp b/engines/sci/gfx/resource/sci_picfill.cpp index 669c30ee8e..0867b84c6e 100644 --- a/engines/sci/gfx/resource/sci_picfill.cpp +++ b/engines/sci/gfx/resource/sci_picfill.cpp @@ -23,7 +23,7 @@ * */ -#include "sci/include/gfx_resource.h" +#include "sci/gfx/gfx_resource.h" namespace Sci { diff --git a/engines/sci/gfx/resource/sci_resmgr.cpp b/engines/sci/gfx/resource/sci_resmgr.cpp index a82ff3c979..734c91e2c3 100644 --- a/engines/sci/gfx/resource/sci_resmgr.cpp +++ b/engines/sci/gfx/resource/sci_resmgr.cpp @@ -27,9 +27,9 @@ #include "sci/include/sci_memory.h" #include "sci/include/sciresource.h" -#include "sci/include/gfx_widgets.h" -#include "sci/include/gfx_resmgr.h" -#include "sci/include/gfx_options.h" +#include "sci/gfx/gfx_widgets.h" +#include "sci/gfx/gfx_resmgr.h" +#include "sci/gfx/gfx_options.h" #include "common/util.h" diff --git a/engines/sci/gfx/resource/sci_view_0.cpp b/engines/sci/gfx/resource/sci_view_0.cpp index 437733328e..a43a8acac5 100644 --- a/engines/sci/gfx/resource/sci_view_0.cpp +++ b/engines/sci/gfx/resource/sci_view_0.cpp @@ -24,9 +24,9 @@ */ #include "sci/include/sci_memory.h" -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/gfx/resource/sci_view_1.cpp b/engines/sci/gfx/resource/sci_view_1.cpp index 1a395e93f1..6da617c7ec 100644 --- a/engines/sci/gfx/resource/sci_view_1.cpp +++ b/engines/sci/gfx/resource/sci_view_1.cpp @@ -26,9 +26,9 @@ // SCI 1 view resource defrobnicator #include "sci/include/sci_memory.h" -#include "sci/include/gfx_system.h" -#include "sci/include/gfx_resource.h" -#include "sci/include/gfx_tools.h" +#include "sci/gfx/gfx_system.h" +#include "sci/gfx/gfx_resource.h" +#include "sci/gfx/gfx_tools.h" namespace Sci { diff --git a/engines/sci/gfx/sbtree.cpp b/engines/sci/gfx/sbtree.cpp index fd7e7f0197..5520dd156d 100644 --- a/engines/sci/gfx/sbtree.cpp +++ b/engines/sci/gfx/sbtree.cpp @@ -27,9 +27,7 @@ #include "sci/include/sci_memory.h" -#include "sci/include/sbtree.h" -#include <stdlib.h> -#include <stdio.h> +#include "sci/gfx/sbtree.h" namespace Sci { diff --git a/engines/sci/include/sbtree.h b/engines/sci/gfx/sbtree.h index 0639d80bfc..0639d80bfc 100644 --- a/engines/sci/include/sbtree.h +++ b/engines/sci/gfx/sbtree.h diff --git a/engines/sci/gfx/sci_widgets.cpp b/engines/sci/gfx/sci_widgets.cpp index 2a059b8641..7e853904db 100644 --- a/engines/sci/gfx/sci_widgets.cpp +++ b/engines/sci/gfx/sci_widgets.cpp @@ -23,8 +23,8 @@ * */ -#include "sci/include/gfx_operations.h" -#include "sci/include/gfx_widgets.h" +#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/gfx_widgets.h" #include "sci/include/engine.h" #include "sci/include/menubar.h" #include "sci/include/sci_widgets.h" diff --git a/engines/sci/gfx/widgets.cpp b/engines/sci/gfx/widgets.cpp index e3a662ff17..1253829a41 100644 --- a/engines/sci/gfx/widgets.cpp +++ b/engines/sci/gfx/widgets.cpp @@ -24,7 +24,7 @@ */ #include "sci/include/sci_memory.h" -#include "sci/include/gfx_widgets.h" +#include "sci/gfx/gfx_widgets.h" namespace Sci { diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h index d6e54460a8..27416b3beb 100644 --- a/engines/sci/include/engine.h +++ b/engines/sci/include/engine.h @@ -42,8 +42,8 @@ namespace Common { #include "sci/include/menubar.h" #include "sci/include/versions.h" #include "sci/include/kernel.h" -#include "sci/include/gfx_state_internal.h" -#include "sci/include/sfx_engine.h" +#include "sci/gfx/gfx_state_internal.h" +#include "sci/sfx/sfx_engine.h" namespace Sci { diff --git a/engines/sci/include/menubar.h b/engines/sci/include/menubar.h index 7e8a0131a3..e437bddcf5 100644 --- a/engines/sci/include/menubar.h +++ b/engines/sci/include/menubar.h @@ -28,8 +28,8 @@ #ifndef _SCI_MENUBAR_H_ #define _SCI_MENUBAR_H_ -#include "sci/include/gfx_operations.h" -#include "sci/include/gfx_widgets.h" +#include "sci/gfx/gfx_operations.h" +#include "sci/gfx/gfx_widgets.h" namespace Sci { diff --git a/engines/sci/include/sciconsole.h b/engines/sci/include/sciconsole.h index 7e0ad876c4..c3b93a4671 100644 --- a/engines/sci/include/sciconsole.h +++ b/engines/sci/include/sciconsole.h @@ -39,7 +39,7 @@ #include "sci/include/vm_types.h" #define SCI_CONSOLE -#include "sci/include/gfx_operations.h" +#include "sci/gfx/gfx_operations.h" namespace Sci { diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp index 705546f6a4..34dd9d4647 100644 --- a/engines/sci/scicore/resource.cpp +++ b/engines/sci/scicore/resource.cpp @@ -38,15 +38,6 @@ namespace Sci { #undef SCI_REQUIRE_RESOURCE_FILES //#define SCI_VERBOSE_RESMGR 1 -// FIXME: Get rid of G_DIR_SEPARATOR / G_DIR_SEPARATOR_S -#if _MSC_VER -# define G_DIR_SEPARATOR_S "\\" -# define G_DIR_SEPARATOR '\\' -#else -# define G_DIR_SEPARATOR_S "/" -# define G_DIR_SEPARATOR '/' -#endif - const char* sci_version_types[] = { "SCI version undetermined (Autodetect failed / not run)", "SCI version 0.xxx", diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp index 5ff66716b3..4d40d002ca 100644 --- a/engines/sci/sfx/core.cpp +++ b/engines/sci/sfx/core.cpp @@ -26,9 +26,9 @@ /* Sound subsystem core: Event handler, sound player dispatching */ #include <stdio.h> -#include "sci/include/sfx_timer.h" -#include "sci/include/sfx_iterator_internal.h" -#include "sci/include/sfx_player.h" +#include "sci/sfx/sfx_timer.h" +#include "sci/sfx/sfx_iterator_internal.h" +#include "sci/sfx/sfx_player.h" #include "sci/sfx/mixer.h" #include "sci/include/sci_midi.h" #include "common/mutex.h" diff --git a/engines/sci/sfx/iterator.cpp b/engines/sci/sfx/iterator.cpp index 7c98e6d691..ff4faafde2 100644 --- a/engines/sci/sfx/iterator.cpp +++ b/engines/sci/sfx/iterator.cpp @@ -27,8 +27,8 @@ #include <stdio.h> #include "common/util.h" -#include "sci/include/sfx_iterator_internal.h" -#include "sci/include/sfx_player.h" +#include "sci/sfx/sfx_iterator_internal.h" +#include "sci/sfx/sfx_player.h" #include "sci/tools.h" #include "sci/include/sci_memory.h" diff --git a/engines/sci/sfx/mixer.h b/engines/sci/sfx/mixer.h index 286dbc3a89..aea58ce2c9 100644 --- a/engines/sci/sfx/mixer.h +++ b/engines/sci/sfx/mixer.h @@ -26,7 +26,7 @@ #ifndef SCI_SFX_MIXER_H #define SCI_SFX_MIXER_H -#include "sci/include/sfx_pcm.h" +#include "sci/sfx/sfx_pcm.h" namespace Sci { diff --git a/engines/sci/sfx/pcm-iterator.cpp b/engines/sci/sfx/pcm-iterator.cpp index 9c72edfa13..7bf9ed6a06 100644 --- a/engines/sci/sfx/pcm-iterator.cpp +++ b/engines/sci/sfx/pcm-iterator.cpp @@ -23,7 +23,7 @@ * */ -#include "sci/include/sfx_iterator.h" +#include "sci/sfx/sfx_iterator.h" #include "sci/tools.h" /* for BREAKPOINT */ #include "sci/include/sci_memory.h" diff --git a/engines/sci/sfx/pcm_device.cpp b/engines/sci/sfx/pcm_device.cpp index 267dfa25e2..a0f590ee82 100644 --- a/engines/sci/sfx/pcm_device.cpp +++ b/engines/sci/sfx/pcm_device.cpp @@ -23,8 +23,8 @@ * */ -#include "sci/include/sfx_time.h" -#include "sci/include/sfx_pcm.h" +#include "sci/sfx/sfx_time.h" +#include "sci/sfx/sfx_pcm.h" #include "engines/engine.h" #include "sound/audiostream.h" #include "sound/mixer.h" diff --git a/engines/sci/sfx/player/players.cpp b/engines/sci/sfx/player/players.cpp index 32623d0fc7..131c467cff 100644 --- a/engines/sci/sfx/player/players.cpp +++ b/engines/sci/sfx/player/players.cpp @@ -23,7 +23,7 @@ * */ -#include "sci/include/sfx_player.h" +#include "sci/sfx/sfx_player.h" namespace Sci { diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index ab75c705e3..869f7c00b2 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/engines/sci/sfx/player/polled.cpp @@ -27,7 +27,7 @@ #include "common/util.h" #include "common/file.h" -#include "sci/include/sfx_player.h" +#include "sci/sfx/sfx_player.h" #include "sci/sfx/softseq.h" #include "sci/sfx/mixer.h" diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp index e749f49220..ab08d7f44b 100644 --- a/engines/sci/sfx/player/realtime.cpp +++ b/engines/sci/sfx/player/realtime.cpp @@ -27,7 +27,7 @@ ** prays for some reasonable amount of soft real-time, but it's close ** enough, I guess. */ -#include "sci/include/sfx_player.h" +#include "sci/sfx/sfx_player.h" #include "sci/sfx/sequencer.h" namespace Sci { diff --git a/engines/sci/sfx/sequencer.h b/engines/sci/sfx/sequencer.h index d292a8100d..803b731449 100644 --- a/engines/sci/sfx/sequencer.h +++ b/engines/sci/sfx/sequencer.h @@ -30,7 +30,7 @@ #include "common/scummsys.h" #include "sci/tools.h" // For GTimeVal -#include "sci/include/sfx_core.h" +#include "sci/sfx/sfx_core.h" #include "sci/sfx/device.h" #include "sci/include/scitypes.h" diff --git a/engines/sci/include/sfx_core.h b/engines/sci/sfx/sfx_core.h index 7ac02d6cfc..7ac02d6cfc 100644 --- a/engines/sci/include/sfx_core.h +++ b/engines/sci/sfx/sfx_core.h diff --git a/engines/sci/include/sfx_engine.h b/engines/sci/sfx/sfx_engine.h index 3a037aa60b..60893e550f 100644 --- a/engines/sci/include/sfx_engine.h +++ b/engines/sci/sfx/sfx_engine.h @@ -27,9 +27,9 @@ #ifndef _SFX_ENGINE_H_ #define _SFX_ENGINE_H_ -#include "sci/include/sfx_core.h" -#include "sci/include/sfx_songlib.h" -#include "sci/include/sfx_iterator.h" +#include "sci/sfx/sfx_core.h" +#include "sci/sfx/sfx_songlib.h" +#include "sci/sfx/sfx_iterator.h" #include "sci/include/sciresource.h" namespace Sci { diff --git a/engines/sci/include/sfx_iterator.h b/engines/sci/sfx/sfx_iterator.h index ceab4c5c47..9dc1f3a3b3 100644 --- a/engines/sci/include/sfx_iterator.h +++ b/engines/sci/sfx/sfx_iterator.h @@ -28,7 +28,7 @@ #ifndef _SCI_SFX_ITERATOR_H_ #define _SCI_SFX_ITERATOR_H_ -#include "sci/include/sfx_pcm.h" +#include "sci/sfx/sfx_pcm.h" namespace Sci { diff --git a/engines/sci/include/sfx_iterator_internal.h b/engines/sci/sfx/sfx_iterator_internal.h index 8f71267edb..4c104b5c52 100644 --- a/engines/sci/include/sfx_iterator_internal.h +++ b/engines/sci/sfx/sfx_iterator_internal.h @@ -26,7 +26,7 @@ #ifndef _SFX_ITERATOR_INTERNAL_ #define _SFX_ITERATOR_INTERNAL_ -#include "sci/include/sfx_iterator.h" +#include "sci/sfx/sfx_iterator.h" #include "sci/include/sci_midi.h" namespace Sci { diff --git a/engines/sci/include/sfx_pcm.h b/engines/sci/sfx/sfx_pcm.h index 1169354bb8..abb1704741 100644 --- a/engines/sci/include/sfx_pcm.h +++ b/engines/sci/sfx/sfx_pcm.h @@ -26,9 +26,9 @@ #ifndef _SFX_PCM_H_ #define _SFX_PCM_H_ -#include "sci/include/sfx_core.h" -#include "sci/include/sfx_timer.h" -#include "sci/include/sfx_time.h" +#include "sci/sfx/sfx_core.h" +#include "sci/sfx/sfx_timer.h" +#include "sci/sfx/sfx_time.h" #include "sci/include/scitypes.h" namespace Sci { diff --git a/engines/sci/include/sfx_player.h b/engines/sci/sfx/sfx_player.h index 7e3b7ea2f1..b1e6695f14 100644 --- a/engines/sci/include/sfx_player.h +++ b/engines/sci/sfx/sfx_player.h @@ -28,8 +28,8 @@ #ifndef _SFX_PLAYER_H #define _SFX_PLAYER_H -#include "sci/include/sfx_engine.h" -#include "sci/include/sfx_iterator.h" +#include "sci/sfx/sfx_engine.h" +#include "sci/sfx/sfx_iterator.h" #include "sci/include/sciresource.h" namespace Sci { diff --git a/engines/sci/include/sfx_songlib.h b/engines/sci/sfx/sfx_songlib.h index 44523b27d2..6b968bbe08 100644 --- a/engines/sci/include/sfx_songlib.h +++ b/engines/sci/sfx/sfx_songlib.h @@ -32,7 +32,7 @@ #include "sci/tools.h" // For GTimeVal #include "sci/include/scitypes.h" -#include "sci/include/sfx_iterator.h" +#include "sci/sfx/sfx_iterator.h" namespace Sci { diff --git a/engines/sci/include/sfx_time.h b/engines/sci/sfx/sfx_time.h index d362dfa381..d362dfa381 100644 --- a/engines/sci/include/sfx_time.h +++ b/engines/sci/sfx/sfx_time.h diff --git a/engines/sci/include/sfx_timer.h b/engines/sci/sfx/sfx_timer.h index 08120ffe57..581f7d1ac5 100644 --- a/engines/sci/include/sfx_timer.h +++ b/engines/sci/sfx/sfx_timer.h @@ -26,7 +26,7 @@ #ifndef _FREESCI_SFX_TIMER_H_ #define _FREESCI_SFX_TIMER_H_ -#include "sci/include/sfx_core.h" +#include "sci/sfx/sfx_core.h" namespace Sci { diff --git a/engines/sci/sfx/softseq.h b/engines/sci/sfx/softseq.h index 91c50ff3ec..5a2def8f41 100644 --- a/engines/sci/sfx/softseq.h +++ b/engines/sci/sfx/softseq.h @@ -26,8 +26,8 @@ #ifndef SCI_SFX_SOFTSEQ_H #define SCI_SFX_SOFTSEQ_H -#include "sci/include/sfx_core.h" -#include "sci/include/sfx_pcm.h" +#include "sci/sfx/sfx_core.h" +#include "sci/sfx/sfx_pcm.h" #include "sci/sfx/sequencer.h" #include "sci/tools.h" diff --git a/engines/sci/sfx/softseq/opl2.cpp b/engines/sci/sfx/softseq/opl2.cpp index 1de9bd4659..81a0d13fc3 100644 --- a/engines/sci/sfx/softseq/opl2.cpp +++ b/engines/sci/sfx/softseq/opl2.cpp @@ -43,7 +43,7 @@ ***************************************************************************/ #include "sci/tools.h" -#include "sci/include/sfx_iterator.h" +#include "sci/sfx/sfx_iterator.h" #include "../softseq.h" #include "../adlib.h" #include <math.h> diff --git a/engines/sci/sfx/songlib.cpp b/engines/sci/sfx/songlib.cpp index 4adc1efa25..d98e387a96 100644 --- a/engines/sci/sfx/songlib.cpp +++ b/engines/sci/sfx/songlib.cpp @@ -24,7 +24,7 @@ */ #include <stdio.h> -#include "sci/include/sfx_engine.h" +#include "sci/sfx/sfx_engine.h" #include "sci/include/sci_memory.h" namespace Sci { diff --git a/engines/sci/sfx/time.cpp b/engines/sci/sfx/time.cpp index 418343584a..720c233968 100644 --- a/engines/sci/sfx/time.cpp +++ b/engines/sci/sfx/time.cpp @@ -23,7 +23,7 @@ * */ -#include "sci/include/sfx_time.h" +#include "sci/sfx/sfx_time.h" #include "sci/tools.h" namespace Sci { diff --git a/engines/sci/sfx/timer.cpp b/engines/sci/sfx/timer.cpp index ba2453579d..d58de323cd 100644 --- a/engines/sci/sfx/timer.cpp +++ b/engines/sci/sfx/timer.cpp @@ -25,7 +25,7 @@ #include "common/timer.h" #include "engines/engine.h" -#include "sci/include/sfx_timer.h" +#include "sci/sfx/sfx_timer.h" namespace Sci { |