diff options
Diffstat (limited to 'engines')
71 files changed, 106 insertions, 107 deletions
diff --git a/engines/titanic/core/file_item.h b/engines/titanic/core/file_item.h index 65dbf9d526..34ba0ae683 100644 --- a/engines/titanic/core/file_item.h +++ b/engines/titanic/core/file_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_FILE_ITEM_H #define TITANIC_FILE_ITEM_H -#include "titanic/string.h" +#include "titanic/support/string.h" #include "titanic/core/list.h" #include "titanic/core/tree_item.h" diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index ee7e071423..26b78247ba 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -20,11 +20,11 @@ * */ -#include "titanic/files_manager.h" +#include "titanic/support/files_manager.h" #include "titanic/game_manager.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/titanic.h" -#include "titanic/video_surface.h" +#include "titanic/support/video_surface.h" #include "titanic/core/game_object.h" #include "titanic/core/resource_key.h" #include "titanic/pet_control/pet_control.h" diff --git a/engines/titanic/core/game_object.h b/engines/titanic/core/game_object.h index b221a7ed23..d8d3a0be64 100644 --- a/engines/titanic/core/game_object.h +++ b/engines/titanic/core/game_object.h @@ -23,8 +23,8 @@ #ifndef TITANIC_GAME_OBJECT_H #define TITANIC_GAME_OBJECT_H -#include "titanic/mouse_cursor.h" -#include "titanic/rect.h" +#include "titanic/support/mouse_cursor.h" +#include "titanic/support/rect.h" #include "titanic/core/movie_clip.h" #include "titanic/core/named_item.h" #include "titanic/pet_control/pet_section.h" diff --git a/engines/titanic/core/link_item.h b/engines/titanic/core/link_item.h index 83b2ce4f06..72829720d7 100644 --- a/engines/titanic/core/link_item.h +++ b/engines/titanic/core/link_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_LINK_ITEM_H #define TITANIC_LINK_ITEM_H -#include "titanic/mouse_cursor.h" +#include "titanic/support/mouse_cursor.h" #include "titanic/core/named_item.h" #include "titanic/core/movie_clip.h" diff --git a/engines/titanic/core/list.h b/engines/titanic/core/list.h index 63bd6227b9..1905c0ffa8 100644 --- a/engines/titanic/core/list.h +++ b/engines/titanic/core/list.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" #include "common/list.h" -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/core/saveable_object.h" namespace Titanic { diff --git a/engines/titanic/core/project_item.h b/engines/titanic/core/project_item.h index ef7ccb65f9..0807460852 100644 --- a/engines/titanic/core/project_item.h +++ b/engines/titanic/core/project_item.h @@ -24,7 +24,7 @@ #define TITANIC_PROJECT_ITEM_H #include "common/scummsys.h" -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/core/dont_save_file_item.h" #include "titanic/core/file_item.h" #include "titanic/core/list.h" diff --git a/engines/titanic/core/resource_key.cpp b/engines/titanic/core/resource_key.cpp index 089df9856a..537dd432f0 100644 --- a/engines/titanic/core/resource_key.cpp +++ b/engines/titanic/core/resource_key.cpp @@ -22,7 +22,7 @@ #include "common/file.h" #include "titanic/titanic.h" -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/core/resource_key.h" namespace Titanic { diff --git a/engines/titanic/core/resource_key.h b/engines/titanic/core/resource_key.h index ab49cb8b12..8a6f86f193 100644 --- a/engines/titanic/core/resource_key.h +++ b/engines/titanic/core/resource_key.h @@ -23,7 +23,7 @@ #ifndef TITANIC_RESOURCE_KEY_H #define TITANIC_RESOURCE_KEY_H -#include "titanic/string.h" +#include "titanic/support/string.h" #include "titanic/core/saveable_object.h" namespace Titanic { diff --git a/engines/titanic/core/room_item.h b/engines/titanic/core/room_item.h index 9e7f553407..f14c3ae32b 100644 --- a/engines/titanic/core/room_item.h +++ b/engines/titanic/core/room_item.h @@ -23,7 +23,7 @@ #ifndef TITANIC_ROOM_ITEM_H #define TITANIC_ROOM_ITEM_H -#include "titanic/rect.h" +#include "titanic/support/rect.h" #include "titanic/core/list.h" #include "titanic/core/movie_clip.h" #include "titanic/core/named_item.h" diff --git a/engines/titanic/core/saveable_object.h b/engines/titanic/core/saveable_object.h index 5a6e4c999d..e067df2b99 100644 --- a/engines/titanic/core/saveable_object.h +++ b/engines/titanic/core/saveable_object.h @@ -27,7 +27,7 @@ #include "common/array.h" #include "common/hash-str.h" #include "common/list.h" -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" namespace Titanic { diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp index b0e30f5072..666d7e7105 100644 --- a/engines/titanic/core/view_item.cpp +++ b/engines/titanic/core/view_item.cpp @@ -21,7 +21,7 @@ */ #include "titanic/game_manager.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/core/project_item.h" #include "titanic/core/room_item.h" #include "titanic/core/view_item.h" diff --git a/engines/titanic/game_location.h b/engines/titanic/game_location.h index a64a82403b..f145d36340 100644 --- a/engines/titanic/game_location.h +++ b/engines/titanic/game_location.h @@ -23,7 +23,7 @@ #ifndef TITANIC_GAME_LOCATION_H #define TITANIC_GAME_LOCATION_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/core/node_item.h" #include "titanic/core/room_item.h" #include "titanic/core/view_item.h" diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp index d5547a3ab7..b6eac3eb82 100644 --- a/engines/titanic/game_manager.cpp +++ b/engines/titanic/game_manager.cpp @@ -23,7 +23,7 @@ #include "titanic/titanic.h" #include "titanic/game_manager.h" #include "titanic/game_view.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/core/project_item.h" #include "titanic/messages/messages.h" #include "titanic/pet_control/pet_control.h" diff --git a/engines/titanic/game_manager.h b/engines/titanic/game_manager.h index 6ad0843e96..b8f5d02463 100644 --- a/engines/titanic/game_manager.h +++ b/engines/titanic/game_manager.h @@ -27,8 +27,8 @@ #include "titanic/game_state.h" #include "titanic/input_handler.h" #include "titanic/input_translator.h" -#include "titanic/simple_file.h" -#include "titanic/video_surface.h" +#include "titanic/support/simple_file.h" +#include "titanic/support/video_surface.h" #include "titanic/true_talk/true_talk_manager.h" #include "titanic/sound/background_sound_maker.h" #include "titanic/sound/music_room.h" diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp index cef8ed9abb..280c917139 100644 --- a/engines/titanic/game_state.cpp +++ b/engines/titanic/game_state.cpp @@ -23,7 +23,7 @@ #include "titanic/game_state.h" #include "titanic/titanic.h" #include "titanic/game_manager.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" namespace Titanic { diff --git a/engines/titanic/game_state.h b/engines/titanic/game_state.h index ec6ef44422..5a53d217da 100644 --- a/engines/titanic/game_state.h +++ b/engines/titanic/game_state.h @@ -25,9 +25,9 @@ #include "titanic/core/list.h" #include "titanic/core/link_item.h" -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/game_location.h" -#include "titanic/movie.h" +#include "titanic/support/movie.h" namespace Titanic { diff --git a/engines/titanic/game_view.cpp b/engines/titanic/game_view.cpp index 22da0c46bf..2f0e74ac08 100644 --- a/engines/titanic/game_view.cpp +++ b/engines/titanic/game_view.cpp @@ -23,7 +23,7 @@ #include "titanic/game_view.h" #include "titanic/game_manager.h" #include "titanic/main_game_window.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" namespace Titanic { diff --git a/engines/titanic/game_view.h b/engines/titanic/game_view.h index c1d1a001d3..0bba5cfa86 100644 --- a/engines/titanic/game_view.h +++ b/engines/titanic/game_view.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" #include "titanic/core/view_item.h" -#include "titanic/video_surface.h" +#include "titanic/support/video_surface.h" namespace Titanic { diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp index 8323531a1f..0657ebec94 100644 --- a/engines/titanic/input_handler.cpp +++ b/engines/titanic/input_handler.cpp @@ -22,7 +22,7 @@ #include "titanic/input_handler.h" #include "titanic/game_manager.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/titanic.h" #include "titanic/pet_control/pet_control.h" diff --git a/engines/titanic/input_handler.h b/engines/titanic/input_handler.h index 7495082ddf..4e8966fdc4 100644 --- a/engines/titanic/input_handler.h +++ b/engines/titanic/input_handler.h @@ -23,7 +23,7 @@ #ifndef TITANIC_INPUT_HANDLER_H #define TITANIC_INPUT_HANDLER_H -#include "titanic/rect.h" +#include "titanic/support/rect.h" #include "titanic/input_translator.h" #include "titanic/core/tree_item.h" diff --git a/engines/titanic/main_game_window.h b/engines/titanic/main_game_window.h index 42517f5a08..78f01b9d79 100644 --- a/engines/titanic/main_game_window.h +++ b/engines/titanic/main_game_window.h @@ -27,7 +27,7 @@ #include "common/array.h" #include "titanic/game_manager.h" #include "titanic/game_view.h" -#include "titanic/image.h" +#include "titanic/support/image.h" #include "titanic/core/project_item.h" namespace Titanic { diff --git a/engines/titanic/messages/mouse_messages.h b/engines/titanic/messages/mouse_messages.h index 41943818e2..1bc77b6a87 100644 --- a/engines/titanic/messages/mouse_messages.h +++ b/engines/titanic/messages/mouse_messages.h @@ -23,7 +23,7 @@ #ifndef TITANIC_MOUSE_MESSAGES_H #define TITANIC_MOUSE_MESSAGES_H -#include "titanic/rect.h" +#include "titanic/support/rect.h" #include "titanic/messages/messages.h" namespace Titanic { diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 4ab5caf3cd..441de8c1f3 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -3,29 +3,15 @@ MODULE := engines/titanic MODULE_OBJS := \ debugger.o \ detection.o \ - direct_draw.o \ - direct_draw_surface.o \ events.o \ - files_manager.o \ - font.o \ game_location.o \ game_manager.o \ game_state.o \ game_view.o \ - image.o \ - image_decoders.o \ input_handler.o \ input_translator.o \ main_game_window.o \ - mouse_cursor.o \ - movie.o \ - rect.o \ - screen_manager.o \ - simple_file.o \ - string.o \ - text_cursor.o \ titanic.o \ - video_surface.o \ carry/auditory_centre.o \ carry/arm.o \ carry/bowl_ear.o \ @@ -436,6 +422,20 @@ MODULE_OBJS := \ star_control/star_control_sub13.o \ star_control/star_control_sub14.o \ star_control/star_control_sub15.o \ + support/direct_draw.o \ + support/direct_draw_surface.o \ + support/files_manager.o \ + support/font.o \ + support/image.o \ + support/image_decoders.o \ + support/mouse_cursor.o \ + support/movie.o \ + support/rect.o \ + support/screen_manager.o \ + support/simple_file.o \ + support/string.o \ + support/text_cursor.o \ + support/video_surface.o \ true_talk/barbot_script.o \ true_talk/bellbot_script.o \ true_talk/deskbot_script.o \ diff --git a/engines/titanic/pet_control/pet_control_sub10.h b/engines/titanic/pet_control/pet_control_sub10.h index aabb59638e..ef8d02f95c 100644 --- a/engines/titanic/pet_control/pet_control_sub10.h +++ b/engines/titanic/pet_control/pet_control_sub10.h @@ -26,7 +26,7 @@ #include "titanic/core/list.h" #include "titanic/pet_control/pet_control_sub10.h" #include "titanic/pet_control/pet_control_list_item.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" namespace Titanic { diff --git a/engines/titanic/pet_control/pet_control_sub12.h b/engines/titanic/pet_control/pet_control_sub12.h index 88faf3d074..70010f0bd9 100644 --- a/engines/titanic/pet_control/pet_control_sub12.h +++ b/engines/titanic/pet_control/pet_control_sub12.h @@ -23,8 +23,8 @@ #ifndef TITANIC_PET_CONTROL_SUB12_H #define TITANIC_PET_CONTROL_SUB12_H -#include "titanic/simple_file.h" -#include "titanic/screen_manager.h" +#include "titanic/support/simple_file.h" +#include "titanic/support/screen_manager.h" namespace Titanic { diff --git a/engines/titanic/pet_control/pet_element.h b/engines/titanic/pet_control/pet_element.h index 13f209cefa..2d56b57c66 100644 --- a/engines/titanic/pet_control/pet_element.h +++ b/engines/titanic/pet_control/pet_element.h @@ -23,8 +23,8 @@ #ifndef TITANIC_PET_ELEMENT_H #define TITANIC_PET_ELEMENT_H -#include "titanic/simple_file.h" -#include "titanic/string.h" +#include "titanic/support/simple_file.h" +#include "titanic/support/string.h" #include "titanic/core/link_item.h" #include "titanic/messages/mouse_messages.h" diff --git a/engines/titanic/pet_control/pet_inventory.h b/engines/titanic/pet_control/pet_inventory.h index 3f1d26d796..01f9ebb8d3 100644 --- a/engines/titanic/pet_control/pet_inventory.h +++ b/engines/titanic/pet_control/pet_inventory.h @@ -23,7 +23,7 @@ #ifndef TITANIC_PET_INVENTORY_H #define TITANIC_PET_INVENTORY_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/pet_control/pet_section.h" #include "titanic/pet_control/pet_control_sub10.h" #include "titanic/pet_control/pet_control_sub12.h" diff --git a/engines/titanic/pet_control/pet_section.h b/engines/titanic/pet_control/pet_section.h index 352e22420a..169f0c0e20 100644 --- a/engines/titanic/pet_control/pet_section.h +++ b/engines/titanic/pet_control/pet_section.h @@ -24,7 +24,7 @@ #define TITANIC_PET_SECTION_H #include "titanic/messages/mouse_messages.h" -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" namespace Titanic { diff --git a/engines/titanic/sound/sound.h b/engines/titanic/sound/sound.h index fe115f7237..804263c59d 100644 --- a/engines/titanic/sound/sound.h +++ b/engines/titanic/sound/sound.h @@ -23,7 +23,7 @@ #ifndef TITANIC_SOUND_H #define TITANIC_SOUND_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/sound/sound_manager.h" #include "titanic/core/view_item.h" diff --git a/engines/titanic/sound/sound_manager.h b/engines/titanic/sound/sound_manager.h index 29fbb5ad11..f741f97f7b 100644 --- a/engines/titanic/sound/sound_manager.h +++ b/engines/titanic/sound/sound_manager.h @@ -23,7 +23,7 @@ #ifndef TITANIC_SOUND_MANAGER_H #define TITANIC_SOUND_MANAGER_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_control.cpp b/engines/titanic/star_control/star_control.cpp index c8ee8c2d7b..446579855a 100644 --- a/engines/titanic/star_control/star_control.cpp +++ b/engines/titanic/star_control/star_control.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/star_control/star_control.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_control_sub11.cpp b/engines/titanic/star_control/star_control_sub11.cpp index 6c782933ae..f590ee61e6 100644 --- a/engines/titanic/star_control/star_control_sub11.cpp +++ b/engines/titanic/star_control/star_control_sub11.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/star_control/star_control_sub11.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_control_sub11.h b/engines/titanic/star_control/star_control_sub11.h index 6b6807049f..9cb9cbeb50 100644 --- a/engines/titanic/star_control/star_control_sub11.h +++ b/engines/titanic/star_control/star_control_sub11.h @@ -23,7 +23,7 @@ #ifndef TITANIC_STAR_CONTROL_SUB11_H #define TITANIC_STAR_CONTROL_SUB11_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/star_control/star_control_sub12.h" #include "titanic/star_control/star_control_sub13.h" #include "titanic/star_control/star_control_sub15.h" diff --git a/engines/titanic/star_control/star_control_sub12.h b/engines/titanic/star_control/star_control_sub12.h index 6bfc4158b4..586e138969 100644 --- a/engines/titanic/star_control/star_control_sub12.h +++ b/engines/titanic/star_control/star_control_sub12.h @@ -23,7 +23,7 @@ #ifndef TITANIC_STAR_CONTROL_SUB12_H #define TITANIC_STAR_CONTROL_SUB12_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/star_control/star_control_sub13.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_control_sub13.h b/engines/titanic/star_control/star_control_sub13.h index 983fa1c9d4..1ec841ae2d 100644 --- a/engines/titanic/star_control/star_control_sub13.h +++ b/engines/titanic/star_control/star_control_sub13.h @@ -23,7 +23,7 @@ #ifndef TITANIC_STAR_CONTROL_SUB13_H #define TITANIC_STAR_CONTROL_SUB13_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/star_control/star_control_sub6.h" #include "titanic/star_control/star_control_sub14.h" diff --git a/engines/titanic/star_control/star_control_sub14.h b/engines/titanic/star_control/star_control_sub14.h index 63a58bf9c6..2d02d13d8c 100644 --- a/engines/titanic/star_control/star_control_sub14.h +++ b/engines/titanic/star_control/star_control_sub14.h @@ -23,7 +23,7 @@ #ifndef TITANIC_STAR_CONTROL_SUB14_H #define TITANIC_STAR_CONTROL_SUB14_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_control_sub15.h b/engines/titanic/star_control/star_control_sub15.h index 2151c5a622..0e0d2e41c0 100644 --- a/engines/titanic/star_control/star_control_sub15.h +++ b/engines/titanic/star_control/star_control_sub15.h @@ -23,7 +23,7 @@ #ifndef TITANIC_STAR_CONTROL_SUB15_H #define TITANIC_STAR_CONTROL_SUB15_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_control_sub3.h b/engines/titanic/star_control/star_control_sub3.h index d6d1c30eed..08d0835e1c 100644 --- a/engines/titanic/star_control/star_control_sub3.h +++ b/engines/titanic/star_control/star_control_sub3.h @@ -23,7 +23,7 @@ #ifndef TITANIC_STAR_CONTROL_SUB3_H #define TITANIC_STAR_CONTROL_SUB3_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/star_control/star_control_sub4.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_control_sub8.h b/engines/titanic/star_control/star_control_sub8.h index da95f89af9..6dcd147da2 100644 --- a/engines/titanic/star_control/star_control_sub8.h +++ b/engines/titanic/star_control/star_control_sub8.h @@ -23,7 +23,7 @@ #ifndef TITANIC_STAR_CONTROL_SUB8_H #define TITANIC_STAR_CONTROL_SUB8_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" namespace Titanic { diff --git a/engines/titanic/direct_draw.cpp b/engines/titanic/support/direct_draw.cpp index 1c19911068..5ddb25bec9 100644 --- a/engines/titanic/direct_draw.cpp +++ b/engines/titanic/support/direct_draw.cpp @@ -24,7 +24,7 @@ #include "engines/util.h" #include "graphics/pixelformat.h" #include "titanic/titanic.h" -#include "titanic/direct_draw.h" +#include "titanic/support/direct_draw.h" namespace Titanic { diff --git a/engines/titanic/direct_draw.h b/engines/titanic/support/direct_draw.h index cf21c98095..85c344c600 100644 --- a/engines/titanic/direct_draw.h +++ b/engines/titanic/support/direct_draw.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" #include "common/array.h" -#include "titanic/direct_draw_surface.h" +#include "titanic/support/direct_draw_surface.h" namespace Titanic { diff --git a/engines/titanic/direct_draw_surface.cpp b/engines/titanic/support/direct_draw_surface.cpp index 05fe68a347..9ebda15b0e 100644 --- a/engines/titanic/direct_draw_surface.cpp +++ b/engines/titanic/support/direct_draw_surface.cpp @@ -20,8 +20,7 @@ * */ -#include "common/rect.h" -#include "titanic/direct_draw_surface.h" +#include "titanic/support/direct_draw_surface.h" namespace Titanic { diff --git a/engines/titanic/direct_draw_surface.h b/engines/titanic/support/direct_draw_surface.h index 28ff6a8ae6..12848b125d 100644 --- a/engines/titanic/direct_draw_surface.h +++ b/engines/titanic/support/direct_draw_surface.h @@ -26,7 +26,7 @@ #include "common/scummsys.h" #include "common/array.h" #include "graphics/managed_surface.h" -#include "titanic/rect.h" +#include "titanic/support/rect.h" namespace Titanic { diff --git a/engines/titanic/files_manager.cpp b/engines/titanic/support/files_manager.cpp index 10898909e2..179d77f24f 100644 --- a/engines/titanic/files_manager.cpp +++ b/engines/titanic/support/files_manager.cpp @@ -21,7 +21,7 @@ */ #include "common/file.h" -#include "titanic/files_manager.h" +#include "titanic/support/files_manager.h" #include "titanic/game_manager.h" namespace Titanic { diff --git a/engines/titanic/files_manager.h b/engines/titanic/support/files_manager.h index 6c6b54445d..7915149412 100644 --- a/engines/titanic/files_manager.h +++ b/engines/titanic/support/files_manager.h @@ -25,7 +25,7 @@ #include "common/winexe_ne.h" #include "titanic/core/list.h" -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" namespace Titanic { diff --git a/engines/titanic/font.cpp b/engines/titanic/support/font.cpp index fd6bd54401..6862baf79f 100644 --- a/engines/titanic/font.cpp +++ b/engines/titanic/support/font.cpp @@ -21,8 +21,8 @@ */ #include "common/textconsole.h" -#include "titanic/font.h" -#include "titanic/files_manager.h" +#include "titanic/support/font.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/font.h b/engines/titanic/support/font.h index 20b960277d..0fff5125df 100644 --- a/engines/titanic/font.h +++ b/engines/titanic/support/font.h @@ -25,7 +25,7 @@ #include "common/scummsys.h" #include "common/array.h" -#include "titanic/string.h" +#include "titanic/support/string.h" namespace Titanic { diff --git a/engines/titanic/image.cpp b/engines/titanic/support/image.cpp index 0a130419a1..cabdd64cf3 100644 --- a/engines/titanic/image.cpp +++ b/engines/titanic/support/image.cpp @@ -21,7 +21,7 @@ */ #include "common/file.h" -#include "titanic/image.h" +#include "titanic/support/image.h" namespace Titanic { diff --git a/engines/titanic/image.h b/engines/titanic/support/image.h index 9030e81ad7..9030e81ad7 100644 --- a/engines/titanic/image.h +++ b/engines/titanic/support/image.h diff --git a/engines/titanic/image_decoders.cpp b/engines/titanic/support/image_decoders.cpp index 721342ef6d..9fe55eb02b 100644 --- a/engines/titanic/image_decoders.cpp +++ b/engines/titanic/support/image_decoders.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/image_decoders.h" +#include "titanic/support/image_decoders.h" namespace Titanic { diff --git a/engines/titanic/image_decoders.h b/engines/titanic/support/image_decoders.h index d72d6fee5d..b824b786a7 100644 --- a/engines/titanic/image_decoders.h +++ b/engines/titanic/support/image_decoders.h @@ -25,9 +25,9 @@ #include "image/jpeg.h" #include "image/tga.h" -#include "titanic/string.h" -#include "titanic/simple_file.h" -#include "titanic/video_surface.h" +#include "titanic/support/string.h" +#include "titanic/support/simple_file.h" +#include "titanic/support/video_surface.h" namespace Titanic { diff --git a/engines/titanic/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp index 3acd871396..dda16c3b93 100644 --- a/engines/titanic/mouse_cursor.cpp +++ b/engines/titanic/support/mouse_cursor.cpp @@ -22,11 +22,11 @@ #include "graphics/cursorman.h" #include "common/textconsole.h" -#include "titanic/mouse_cursor.h" -#include "titanic/movie.h" -#include "titanic/screen_manager.h" +#include "titanic/support/mouse_cursor.h" +#include "titanic/support/movie.h" +#include "titanic/support/screen_manager.h" #include "titanic/titanic.h" -#include "titanic/video_surface.h" +#include "titanic/support/video_surface.h" #include "titanic/core/resource_key.h" namespace Titanic { diff --git a/engines/titanic/mouse_cursor.h b/engines/titanic/support/mouse_cursor.h index 507f4ecc17..507f4ecc17 100644 --- a/engines/titanic/mouse_cursor.h +++ b/engines/titanic/support/mouse_cursor.h diff --git a/engines/titanic/movie.cpp b/engines/titanic/support/movie.cpp index 193b2cad33..ed5cffaac1 100644 --- a/engines/titanic/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/movie.h" +#include "titanic/support/movie.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/movie.h b/engines/titanic/support/movie.h index 3529409fa5..3529409fa5 100644 --- a/engines/titanic/movie.h +++ b/engines/titanic/support/movie.h diff --git a/engines/titanic/rect.cpp b/engines/titanic/support/rect.cpp index 228a2ae4d4..5fce4402cb 100644 --- a/engines/titanic/rect.cpp +++ b/engines/titanic/support/rect.cpp @@ -20,7 +20,7 @@ * */ -#include "titanic/rect.h" +#include "titanic/support/rect.h" namespace Titanic { diff --git a/engines/titanic/rect.h b/engines/titanic/support/rect.h index 1661711870..1661711870 100644 --- a/engines/titanic/rect.h +++ b/engines/titanic/support/rect.h diff --git a/engines/titanic/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp index 99de75a6f4..05dfa66854 100644 --- a/engines/titanic/screen_manager.cpp +++ b/engines/titanic/support/screen_manager.cpp @@ -20,9 +20,9 @@ * */ -#include "titanic/screen_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/titanic.h" -#include "titanic/video_surface.h" +#include "titanic/support/video_surface.h" namespace Titanic { diff --git a/engines/titanic/screen_manager.h b/engines/titanic/support/screen_manager.h index e39151b85b..affe2ec0c9 100644 --- a/engines/titanic/screen_manager.h +++ b/engines/titanic/support/screen_manager.h @@ -25,12 +25,12 @@ #include "common/scummsys.h" #include "common/array.h" -#include "titanic/direct_draw.h" -#include "titanic/font.h" +#include "titanic/support/direct_draw.h" +#include "titanic/support/font.h" #include "titanic/input_handler.h" -#include "titanic/mouse_cursor.h" -#include "titanic/text_cursor.h" -#include "titanic/video_surface.h" +#include "titanic/support/mouse_cursor.h" +#include "titanic/support/text_cursor.h" +#include "titanic/support/video_surface.h" #include "titanic/core/resource_key.h" namespace Titanic { diff --git a/engines/titanic/simple_file.cpp b/engines/titanic/support/simple_file.cpp index acf02e8df1..fccf6c5b4f 100644 --- a/engines/titanic/simple_file.cpp +++ b/engines/titanic/support/simple_file.cpp @@ -21,7 +21,7 @@ */ #include "common/util.h" -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" namespace Titanic { diff --git a/engines/titanic/simple_file.h b/engines/titanic/support/simple_file.h index 0568092b4e..0ba7699088 100644 --- a/engines/titanic/simple_file.h +++ b/engines/titanic/support/simple_file.h @@ -24,11 +24,11 @@ #define TITANIC_SIMPLE_FILE_H #include "common/file.h" -#include "titanic/rect.h" +#include "titanic/support/rect.h" #include "common/savefile.h" #include "common/stream.h" #include "common/zlib.h" -#include "titanic/string.h" +#include "titanic/support/string.h" namespace Titanic { diff --git a/engines/titanic/string.cpp b/engines/titanic/support/string.cpp index b4af9206f6..86dc0be0b0 100644 --- a/engines/titanic/string.cpp +++ b/engines/titanic/support/string.cpp @@ -21,7 +21,7 @@ */ #include "common/algorithm.h" -#include "titanic/string.h" +#include "titanic/support/string.h" namespace Titanic { diff --git a/engines/titanic/string.h b/engines/titanic/support/string.h index 02775de067..02775de067 100644 --- a/engines/titanic/string.h +++ b/engines/titanic/support/string.h diff --git a/engines/titanic/text_cursor.cpp b/engines/titanic/support/text_cursor.cpp index ae1f842adb..fd0c1d22dd 100644 --- a/engines/titanic/text_cursor.cpp +++ b/engines/titanic/support/text_cursor.cpp @@ -21,7 +21,7 @@ */ #include "common/textconsole.h" -#include "titanic/text_cursor.h" +#include "titanic/support/text_cursor.h" namespace Titanic { diff --git a/engines/titanic/text_cursor.h b/engines/titanic/support/text_cursor.h index 4b6be8f1c4..b6480673eb 100644 --- a/engines/titanic/text_cursor.h +++ b/engines/titanic/support/text_cursor.h @@ -24,7 +24,7 @@ #define TITANIC_TEXT_CURSOR_H #include "common/scummsys.h" -#include "titanic/rect.h" +#include "titanic/support/rect.h" namespace Titanic { diff --git a/engines/titanic/video_surface.cpp b/engines/titanic/support/video_surface.cpp index 520193f376..6bba24de5f 100644 --- a/engines/titanic/video_surface.cpp +++ b/engines/titanic/support/video_surface.cpp @@ -20,9 +20,9 @@ * */ -#include "titanic/video_surface.h" -#include "titanic/image_decoders.h" -#include "titanic/screen_manager.h" +#include "titanic/support/video_surface.h" +#include "titanic/support/image_decoders.h" +#include "titanic/support/screen_manager.h" namespace Titanic { diff --git a/engines/titanic/video_surface.h b/engines/titanic/support/video_surface.h index de181581eb..1de6a1dd34 100644 --- a/engines/titanic/video_surface.h +++ b/engines/titanic/support/video_surface.h @@ -25,10 +25,10 @@ #include "common/scummsys.h" #include "common/array.h" -#include "titanic/font.h" -#include "titanic/direct_draw.h" -#include "titanic/movie.h" -#include "titanic/rect.h" +#include "titanic/support/font.h" +#include "titanic/support/direct_draw.h" +#include "titanic/support/movie.h" +#include "titanic/support/rect.h" #include "titanic/core/list.h" #include "titanic/core/resource_key.h" diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h index 6b85211194..a5549e463b 100644 --- a/engines/titanic/titanic.h +++ b/engines/titanic/titanic.h @@ -32,11 +32,11 @@ #include "graphics/screen.h" #include "titanic/debugger.h" #include "titanic/events.h" -#include "titanic/files_manager.h" +#include "titanic/support/files_manager.h" #include "titanic/main_game_window.h" -#include "titanic/movie.h" -#include "titanic/screen_manager.h" -#include "titanic/string.h" +#include "titanic/support/movie.h" +#include "titanic/support/screen_manager.h" +#include "titanic/support/string.h" /** * This is the namespace of the Titanic engine. diff --git a/engines/titanic/true_talk/true_talk_manager.h b/engines/titanic/true_talk/true_talk_manager.h index 6724baaa34..4cd892c3ba 100644 --- a/engines/titanic/true_talk/true_talk_manager.h +++ b/engines/titanic/true_talk/true_talk_manager.h @@ -23,7 +23,7 @@ #ifndef TITANIC_TRUE_TALK_MANAGER_H #define TITANIC_TRUE_TALK_MANAGER_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/true_talk/title_engine.h" #include "titanic/true_talk/tt_scripts.h" diff --git a/engines/titanic/true_talk/tt_named_script.h b/engines/titanic/true_talk/tt_named_script.h index 9186507e87..ec5c35c843 100644 --- a/engines/titanic/true_talk/tt_named_script.h +++ b/engines/titanic/true_talk/tt_named_script.h @@ -23,7 +23,7 @@ #ifndef TITANIC_TT_NAMED_SCRIPT_H #define TITANIC_TT_NAMED_SCRIPT_H -#include "titanic/simple_file.h" +#include "titanic/support/simple_file.h" #include "titanic/true_talk/tt_script_base.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_string.h b/engines/titanic/true_talk/tt_string.h index cf940a4d32..60fdde0ff5 100644 --- a/engines/titanic/true_talk/tt_string.h +++ b/engines/titanic/true_talk/tt_string.h @@ -23,7 +23,7 @@ #ifndef TITANIC_TT_STRING_H #define TITANIC_TT_STRING_H -#include "titanic/string.h" +#include "titanic/support/string.h" namespace Titanic { |