diff options
Diffstat (limited to 'engines/sci/include')
34 files changed, 89 insertions, 89 deletions
diff --git a/engines/sci/include/conf_parse.h b/engines/sci/include/conf_parse.h index d5ffd5b9da..b4aec93ec2 100644 --- a/engines/sci/include/conf_parse.h +++ b/engines/sci/include/conf_parse.h @@ -29,7 +29,7 @@ #ifndef CONF_PARSE_H_ #define CONF_PARSE_H_ -#include <conf_extension.h> +#include "sci/include/conf_extension.h" #define CONF_PARSE_TYPE_WHITESPACE 1 /* Whitespace, comments */ #define CONF_PARSE_TYPE_SUBSECTION 2 /* Subsection division */ diff --git a/engines/sci/include/console.h b/engines/sci/include/console.h index fafa276298..9051b6bcd9 100644 --- a/engines/sci/include/console.h +++ b/engines/sci/include/console.h @@ -33,9 +33,9 @@ #ifndef _SCI_CONSOLE_H_ #define _SCI_CONSOLE_H_ -#include <sci_memory.h> -#include <resource.h> -#include <vm_types.h> +#include "sci/include/sci_memory.h" +#include "sci/include/resource.h" +#include "sci/include/vm_types.h" #ifdef HAVE_CONFIG_H #include <config.h> @@ -46,7 +46,7 @@ #endif #define SCI_CONSOLE -#include <gfx_operations.h> +#include "sci/include/gfx_operations.h" extern DLLEXTERN int con_passthrough; diff --git a/engines/sci/include/engine.h b/engines/sci/include/engine.h index 08a26fe98b..871ffca3e9 100644 --- a/engines/sci/include/engine.h +++ b/engines/sci/include/engine.h @@ -30,18 +30,18 @@ #include <config.h> #endif /* HAVE_CONFIG_H */ -#include <resource.h> -#include <sciresource.h> -#include <script.h> -#include <vocabulary.h> -#include <console.h> -#include <vm.h> -#include <menubar.h> +#include "sci/include/resource.h" +#include "sci/include/sciresource.h" +#include "sci/include/script.h" +#include "sci/include/vocabulary.h" +#include "sci/include/console.h" +#include "sci/include/vm.h" +#include "sci/include/menubar.h" #include <time.h> -#include <versions.h> -#include <kernel.h> -#include <gfx_state_internal.h> -#include <sfx_engine.h> +#include "sci/include/versions.h" +#include "sci/include/kernel.h" +#include "sci/include/gfx_state_internal.h" +#include "sci/include/sfx_engine.h" #define FREESCI_CURRENT_SAVEGAME_VERSION 7 #define FREESCI_MINIMUM_SAVEGAME_VERSION 7 diff --git a/engines/sci/include/event.h b/engines/sci/include/event.h index aea54b1af2..8346ce7dee 100644 --- a/engines/sci/include/event.h +++ b/engines/sci/include/event.h @@ -1,7 +1,7 @@ #ifndef EVENT_H #define EVENT_H -#include <uinput.h> +#include "sci/include/uinput.h" struct _state; diff --git a/engines/sci/include/gfx_driver.h b/engines/sci/include/gfx_driver.h index 9903208988..fe66453932 100644 --- a/engines/sci/include/gfx_driver.h +++ b/engines/sci/include/gfx_driver.h @@ -27,8 +27,8 @@ #ifndef _SCI_GFX_DRIVER_H_ #define _SCI_GFX_DRIVER_H_ -#include <gfx_system.h> -#include <uinput.h> +#include "sci/include/gfx_system.h" +#include "sci/include/uinput.h" typedef enum { diff --git a/engines/sci/include/gfx_operations.h b/engines/sci/include/gfx_operations.h index 6e94523da8..c1dbe350b1 100644 --- a/engines/sci/include/gfx_operations.h +++ b/engines/sci/include/gfx_operations.h @@ -28,11 +28,11 @@ #ifndef _GFX_OPERATIONS_H_ #define _GFX_OPERATIONS_H_ -#include <gfx_resmgr.h> -#include <gfx_tools.h> -#include <gfx_options.h> -#include <gfx_system.h> -#include <uinput.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/include/uinput.h" #define GFXOP_NO_POINTER -1 diff --git a/engines/sci/include/gfx_options.h b/engines/sci/include/gfx_options.h index 51b31f794c..f131b4ac63 100644 --- a/engines/sci/include/gfx_options.h +++ b/engines/sci/include/gfx_options.h @@ -29,9 +29,9 @@ #ifndef _GFX_OPTIONS_H_ #define _GFX_OPTIONS_H_ -#include <gfx_resource.h> -#include <gfx_tools.h> -#include <gfx_res_options.h> +#include "sci/include/gfx_resource.h" +#include "sci/include/gfx_tools.h" +#include "sci/include/gfx_res_options.h" /* Dirty rectangle heuristics: */ diff --git a/engines/sci/include/gfx_res_options.h b/engines/sci/include/gfx_res_options.h index 54138a8813..8e3149368f 100644 --- a/engines/sci/include/gfx_res_options.h +++ b/engines/sci/include/gfx_res_options.h @@ -32,8 +32,8 @@ #ifndef _GFX_RES_OPTIONS_H_ #define _GFX_RES_OPTIONS_H_ -#include <gfx_resource.h> -#include <gfx_resmgr.h> +#include "sci/include/gfx_resource.h" +#include "sci/include/gfx_resmgr.h" #define GFX_RES_PATTERN_MIN 0 #define GFX_RES_PATTERN_MAX 65535 diff --git a/engines/sci/include/gfx_resmgr.h b/engines/sci/include/gfx_resmgr.h index f6a476b76f..400d2ede70 100644 --- a/engines/sci/include/gfx_resmgr.h +++ b/engines/sci/include/gfx_resmgr.h @@ -28,8 +28,8 @@ #ifndef _GFX_RESMGR_H_ #define _GFX_RESMGR_H_ -#include <gfx_resource.h> -#include <sbtree.h> +#include "sci/include/gfx_resource.h" +#include "sci/include/sbtree.h" typedef enum { GFX_RESOURCE_TYPE_VIEW = 0, diff --git a/engines/sci/include/gfx_resource.h b/engines/sci/include/gfx_resource.h index 34160c5d5d..8632710556 100644 --- a/engines/sci/include/gfx_resource.h +++ b/engines/sci/include/gfx_resource.h @@ -30,8 +30,8 @@ #ifndef _GFX_RESOURCE_H_ #define _GFX_RESOURCE_H_ -#include <gfx_system.h> -#include <gfx_driver.h> +#include "sci/include/gfx_system.h" +#include "sci/include/gfx_driver.h" /*** Styles for pic0 drawing ***/ /* Dithering modes */ diff --git a/engines/sci/include/gfx_state_internal.h b/engines/sci/include/gfx_state_internal.h index dc12e3c8b9..059bb08653 100644 --- a/engines/sci/include/gfx_state_internal.h +++ b/engines/sci/include/gfx_state_internal.h @@ -28,11 +28,11 @@ #ifndef _GFX_STATE_INTERNAL_H_ #define _GFX_STATE_INTERNAL_H_ -#include <gfx_tools.h> -#include <gfx_options.h> -#include <gfx_operations.h> -#include <gfx_resmgr.h> -#include <gfx_system.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" #define GFXW_FLAG_VISIBLE (1<<0) diff --git a/engines/sci/include/gfx_system.h b/engines/sci/include/gfx_system.h index e83f39fb8e..4943a2aff1 100644 --- a/engines/sci/include/gfx_system.h +++ b/engines/sci/include/gfx_system.h @@ -28,8 +28,8 @@ #ifndef _SCI_GFX_SYSTEM_ #define _SCI_GFX_SYSTEM_ -#include <sci_memory.h> -#include <resource.h> +#include "sci/include/sci_memory.h" +#include "sci/include/resource.h" #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/engines/sci/include/gfx_tools.h b/engines/sci/include/gfx_tools.h index 65fc5cba72..45005302a7 100644 --- a/engines/sci/include/gfx_tools.h +++ b/engines/sci/include/gfx_tools.h @@ -29,8 +29,8 @@ #ifndef _GFX_TOOLS_H_ #define _GFX_TOOLS_H_ -#include <gfx_system.h> -#include <gfx_driver.h> +#include "sci/include/gfx_system.h" +#include "sci/include/gfx_driver.h" typedef enum { GFX_XLATE_FILTER_NONE, diff --git a/engines/sci/include/gfx_widgets.h b/engines/sci/include/gfx_widgets.h index 9ea9352971..37d5557c7a 100644 --- a/engines/sci/include/gfx_widgets.h +++ b/engines/sci/include/gfx_widgets.h @@ -29,7 +29,7 @@ #ifndef _GFX_WIDGETS_H_ #define _GFX_WIDGETS_H_ -#include <gfx_state_internal.h> +#include "sci/include/gfx_state_internal.h" /* Enable the next line to keep a list of pointers to all widgets, with up to the specified amount ** of members (/SLOW/) */ diff --git a/engines/sci/include/heapmgr.h b/engines/sci/include/heapmgr.h index 77583e1f39..6a27e79476 100644 --- a/engines/sci/include/heapmgr.h +++ b/engines/sci/include/heapmgr.h @@ -29,8 +29,8 @@ #ifndef _FREESCI_HEAPMGR_H_ #define _FREESCI_HEAPMGR_H_ -#include <resource.h> -#include <sci_memory.h> +#include "sci/include/resource.h" +#include "sci/include/sci_memory.h" #define HEAPENTRY_INVALID -1 diff --git a/engines/sci/include/kernel.h b/engines/sci/include/kernel.h index 3b675dac65..639db44d65 100644 --- a/engines/sci/include/kernel.h +++ b/engines/sci/include/kernel.h @@ -29,10 +29,10 @@ #include <math.h> #include <ctype.h> -#include <kdebug.h> -#include <uinput.h> -#include <event.h> -#include <console.h> /* sciprintf() */ +#include "sci/include/kdebug.h" +#include "sci/include/uinput.h" +#include "sci/include/event.h" +#include "sci/include/console.h" /* sciprintf() */ #ifdef HAVE_FNMATCH_H #include <fnmatch.h> diff --git a/engines/sci/include/menubar.h b/engines/sci/include/menubar.h index b66b43230a..a2d3c71f7b 100644 --- a/engines/sci/include/menubar.h +++ b/engines/sci/include/menubar.h @@ -29,8 +29,8 @@ #ifndef _SCI_MENUBAR_H_ #define _SCI_MENUBAR_H_ -#include <gfx_operations.h> -#include <gfx_widgets.h> +#include "sci/include/gfx_operations.h" +#include "sci/include/gfx_widgets.h" struct _state; diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index cbb333f574..aa3e31a671 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -99,7 +99,7 @@ # include <dmalloc.h> #endif -#include <scitypes.h> +#include "sci/include/scitypes.h" #ifdef HAVE_UNISTD_H # include <unistd.h> diff --git a/engines/sci/include/sci_memory.h b/engines/sci/include/sci_memory.h index 41e5aa35ac..9ef7fa41cb 100644 --- a/engines/sci/include/sci_memory.h +++ b/engines/sci/include/sci_memory.h @@ -70,7 +70,7 @@ #include <stdio.h> #include <assert.h> -#include <resource.h> +#include "sci/include/resource.h" #ifdef _WIN32 # undef scim_inline /* just to be sure it is not defined */ diff --git a/engines/sci/include/sci_widgets.h b/engines/sci/include/sci_widgets.h index f961021622..edd7552fca 100644 --- a/engines/sci/include/sci_widgets.h +++ b/engines/sci/include/sci_widgets.h @@ -29,7 +29,7 @@ #ifndef _SCI_WIDGETS_H_ #define _SCI_WIDGETS_H_ -#include <engine.h> +#include "sci/include/engine.h" /* The following flags are applicable to windows in SCI0: */ #define WINDOW_FLAG_TRANSPARENT 0x01 diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h index e9ac7cf5d4..c1eb9bd29b 100644 --- a/engines/sci/include/sciresource.h +++ b/engines/sci/include/sciresource.h @@ -35,8 +35,8 @@ /*#define _SCI_RESOURCE_DEBUG */ /*#define _SCI_DECOMPRESS_DEBUG*/ -#include <resource.h> -#include <versions.h> +#include "sci/include/resource.h" +#include "sci/include/versions.h" #define SCI_MAX_RESOURCE_SIZE 0x0400000 /* The maximum allowed size for a compressed or decompressed resource */ diff --git a/engines/sci/include/script.h b/engines/sci/include/script.h index f979bd2a1e..4c7892ebae 100644 --- a/engines/sci/include/script.h +++ b/engines/sci/include/script.h @@ -20,7 +20,7 @@ #ifndef SCRIPT_H #define SCRIPT_H -#include <sciresource.h> +#include "sci/include/sciresource.h" /*#define SCRIPT_DEBUG */ diff --git a/engines/sci/include/seg_manager.h b/engines/sci/include/seg_manager.h index 600792568e..b09632f087 100644 --- a/engines/sci/include/seg_manager.h +++ b/engines/sci/include/seg_manager.h @@ -29,9 +29,9 @@ #ifndef _SCI_SEG_MANAGER_H #define _SCI_SEG_MANAGER_H -#include <int_hashmap.h> -#include <sys_strings.h> -#include <vm.h> +#include "sci/include/int_hashmap.h" +#include "sci/include/sys_strings.h" +#include "sci/include/vm.h" #define DEFAULT_SCRIPTS 32 #define DEFAULT_OBJECTS 8 /* default # of objects per script */ diff --git a/engines/sci/include/sfx_engine.h b/engines/sci/include/sfx_engine.h index 950f1e3dc8..dca2cc94df 100644 --- a/engines/sci/include/sfx_engine.h +++ b/engines/sci/include/sfx_engine.h @@ -28,10 +28,10 @@ #ifndef _SFX_ENGINE_H_ #define _SFX_ENGINE_H_ -#include <sfx_core.h> -#include <sfx_songlib.h> -#include <sfx_iterator.h> -#include <sciresource.h> +#include "sci/include/sfx_core.h" +#include "sci/include/sfx_songlib.h" +#include "sci/include/sfx_iterator.h" +#include "sci/include/sciresource.h" #define SOUND_TICK 1000000 / 60 /* Approximately 16666 microseconds */ diff --git a/engines/sci/include/sfx_iterator.h b/engines/sci/include/sfx_iterator.h index de357b053d..157fb66cd8 100644 --- a/engines/sci/include/sfx_iterator.h +++ b/engines/sci/include/sfx_iterator.h @@ -28,8 +28,8 @@ #ifndef _SCI_SFX_ITERATOR_H_ #define _SCI_SFX_ITERATOR_H_ -#include <sfx_pcm.h> -#include <listener.h> +#include "sci/include/sfx_pcm.h" +#include "sci/include/listener.h" #define SI_FINISHED -1 /* Song finished playing */ #define SI_LOOP -2 /* Song just looped */ diff --git a/engines/sci/include/sfx_iterator_internal.h b/engines/sci/include/sfx_iterator_internal.h index 02b32502ac..51a76889af 100644 --- a/engines/sci/include/sfx_iterator_internal.h +++ b/engines/sci/include/sfx_iterator_internal.h @@ -28,8 +28,8 @@ #ifndef _SFX_ITERATOR_INTERNAL_ #define _SFX_ITERATOR_INTERNAL_ -#include <sfx_iterator.h> -#include <sci_midi.h> +#include "sci/include/sfx_iterator.h" +#include "sci/include/sci_midi.h" /* States */ diff --git a/engines/sci/include/sfx_pcm.h b/engines/sci/include/sfx_pcm.h index b3a44868a9..87da11bbbe 100644 --- a/engines/sci/include/sfx_pcm.h +++ b/engines/sci/include/sfx_pcm.h @@ -28,10 +28,10 @@ #ifndef _SFX_PCM_H_ #define _SFX_PCM_H_ -#include <sfx_core.h> -#include <sfx_timer.h> -#include <sfx_time.h> -#include <scitypes.h> +#include "sci/include/sfx_core.h" +#include "sci/include/sfx_timer.h" +#include "sci/include/sfx_time.h" +#include "sci/include/scitypes.h" /* A number of standard options most devices will support */ #define SFX_PCM_OPTION_RATE "rate" /* Sampling rate: Number of samples per second */ diff --git a/engines/sci/include/sfx_player.h b/engines/sci/include/sfx_player.h index 3198ff7c49..855440f968 100644 --- a/engines/sci/include/sfx_player.h +++ b/engines/sci/include/sfx_player.h @@ -26,9 +26,9 @@ ***************************************************************************/ /* song player structure */ -#include <sfx_engine.h> -#include <sfx_iterator.h> -#include <sciresource.h> +#include "sci/include/sfx_engine.h" +#include "sci/include/sfx_iterator.h" +#include "sci/include/sciresource.h" #ifndef _SFX_PLAYER_H #define _SFX_PLAYER_H diff --git a/engines/sci/include/sfx_songlib.h b/engines/sci/include/sfx_songlib.h index 7aa6ea4fd5..56c9d647d7 100644 --- a/engines/sci/include/sfx_songlib.h +++ b/engines/sci/include/sfx_songlib.h @@ -31,8 +31,8 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#include <scitypes.h> -#include <sfx_iterator.h> +#include "sci/include/scitypes.h" +#include "sci/include/sfx_iterator.h" #define SOUND_STATUS_STOPPED 0 #define SOUND_STATUS_PLAYING 1 diff --git a/engines/sci/include/sfx_timer.h b/engines/sci/include/sfx_timer.h index d747edc3ac..e3402a24cd 100644 --- a/engines/sci/include/sfx_timer.h +++ b/engines/sci/include/sfx_timer.h @@ -28,7 +28,7 @@ #ifndef _FREESCI_SFX_TIMER_H_ #define _FREESCI_SFX_TIMER_H_ -#include <sfx_core.h> +#include "sci/include/sfx_core.h" typedef struct { const char *name; diff --git a/engines/sci/include/versions.h b/engines/sci/include/versions.h index ed184d29c0..5cf4c3c00d 100644 --- a/engines/sci/include/versions.h +++ b/engines/sci/include/versions.h @@ -31,7 +31,7 @@ #ifndef _SCI_VERSIONS_H_ #define _SCI_VERSIONS_H_ -#include <scitypes.h> +#include "sci/include/scitypes.h" struct _state; diff --git a/engines/sci/include/vm.h b/engines/sci/include/vm.h index 567df073f5..1a8a799852 100644 --- a/engines/sci/include/vm.h +++ b/engines/sci/include/vm.h @@ -28,13 +28,13 @@ /* VM and kernel declarations */ -#include <script.h> -#include <vocabulary.h> -#include <versions.h> -#include <seg_manager.h> -#include <vm_types.h> -#include <sys_strings.h> -#include <heapmgr.h> +#include "sci/include/script.h" +#include "sci/include/vocabulary.h" +#include "sci/include/versions.h" +#include "sci/include/seg_manager.h" +#include "sci/include/vm_types.h" +#include "sci/include/sys_strings.h" +#include "sci/include/heapmgr.h" #ifndef _SCI_VM_H #define _SCI_VM_H diff --git a/engines/sci/include/vm_types.h b/engines/sci/include/vm_types.h index 66758425ae..84bf016014 100644 --- a/engines/sci/include/vm_types.h +++ b/engines/sci/include/vm_types.h @@ -29,7 +29,7 @@ #ifndef _SCI_VM_TYPES_H_ #define _SCI_VM_TYPES_H_ -#include <scitypes.h> +#include "sci/include/scitypes.h" #define SCI_REG_SIZE 16; #define SCI_SEG_SIZE 16; diff --git a/engines/sci/include/vocabulary.h b/engines/sci/include/vocabulary.h index fb58dd644b..2219f0ee2a 100644 --- a/engines/sci/include/vocabulary.h +++ b/engines/sci/include/vocabulary.h @@ -28,8 +28,8 @@ #ifndef VOCABULARY_H #define VOCABULARY_H -#include <versions.h> -#include <sciresource.h> +#include "sci/include/versions.h" +#include "sci/include/sciresource.h" /*#define VOCABULARY_DEBUG */ /*#define SCI_SIMPLE_SAID_CODE */ /* Whether the simplified Said() matching should be used */ |