diff options
73 files changed, 257 insertions, 133 deletions
diff --git a/engines/titanic/carry/carry.cpp b/engines/titanic/carry/carry.cpp index 47eea18ec5..bc99e846e9 100644 --- a/engines/titanic/carry/carry.cpp +++ b/engines/titanic/carry/carry.cpp @@ -21,6 +21,7 @@ */ #include "titanic/carry/carry.h" +#include "titanic/debugger.h" #include "titanic/messages/messages.h" #include "titanic/npcs/character.h" #include "titanic/npcs/succubus.h" diff --git a/engines/titanic/continue_save_dialog.cpp b/engines/titanic/continue_save_dialog.cpp index c74e1c7634..3b447135bd 100644 --- a/engines/titanic/continue_save_dialog.cpp +++ b/engines/titanic/continue_save_dialog.cpp @@ -21,7 +21,11 @@ */ #include "titanic/continue_save_dialog.h" +#include "titanic/support/movie_manager.h" #include "titanic/titanic.h" +#include "common/error.h" +#include "common/str-array.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 11b8b58451..ae517a2689 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -24,13 +24,16 @@ #include "titanic/core/mail_man.h" #include "titanic/core/resource_key.h" #include "titanic/core/room_item.h" +#include "titanic/core/project_item.h" +#include "titanic/debugger.h" +#include "titanic/events.h" +#include "titanic/game_manager.h" #include "titanic/npcs/true_talk_npc.h" #include "titanic/pet_control/pet_control.h" #include "titanic/star_control/star_control.h" #include "titanic/support/files_manager.h" #include "titanic/support/screen_manager.h" #include "titanic/support/video_surface.h" -#include "titanic/game_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp index 13bcdfc4b4..0fa5d44511 100644 --- a/engines/titanic/core/project_item.cpp +++ b/engines/titanic/core/project_item.cpp @@ -20,17 +20,18 @@ * */ -#include "common/file.h" -#include "common/savefile.h" -#include "graphics/scaler.h" -#include "graphics/thumbnail.h" -#include "titanic/game_manager.h" -#include "titanic/titanic.h" #include "titanic/core/dont_save_file_item.h" #include "titanic/core/node_item.h" #include "titanic/core/project_item.h" #include "titanic/core/view_item.h" +#include "titanic/events.h" +#include "titanic/game_manager.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/titanic.h" +#include "common/file.h" +#include "common/savefile.h" +#include "graphics/scaler.h" +#include "graphics/thumbnail.h" namespace Titanic { diff --git a/engines/titanic/core/resource_key.cpp b/engines/titanic/core/resource_key.cpp index e10b3be4cb..c7c48b5fdc 100644 --- a/engines/titanic/core/resource_key.cpp +++ b/engines/titanic/core/resource_key.cpp @@ -20,10 +20,11 @@ * */ -#include "common/file.h" -#include "titanic/titanic.h" -#include "titanic/support/simple_file.h" #include "titanic/core/resource_key.h" +#include "titanic/support/files_manager.h" +#include "titanic/support/simple_file.h" +#include "titanic/titanic.h" +#include "common/file.h" namespace Titanic { diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp index 60e08a5582..489ef810e6 100644 --- a/engines/titanic/core/view_item.cpp +++ b/engines/titanic/core/view_item.cpp @@ -20,13 +20,14 @@ * */ -#include "titanic/game_manager.h" -#include "titanic/support/screen_manager.h" +#include "titanic/core/view_item.h" #include "titanic/core/project_item.h" #include "titanic/core/room_item.h" -#include "titanic/core/view_item.h" +#include "titanic/events.h" +#include "titanic/game_manager.h" #include "titanic/messages/messages.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/support/screen_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/debugger.cpp b/engines/titanic/debugger.cpp index ec38291c65..15d098a99a 100644 --- a/engines/titanic/debugger.cpp +++ b/engines/titanic/debugger.cpp @@ -21,11 +21,17 @@ */ #include "titanic/debugger.h" -#include "titanic/titanic.h" +#include "titanic/core/node_item.h" +#include "titanic/core/room_item.h" #include "titanic/core/tree_item.h" +#include "titanic/core/view_item.h" +#include "titanic/game_manager.h" #include "titanic/game/movie_tester.h" +#include "titanic/main_game_window.h" #include "titanic/pet_control/pet_control.h" #include "titanic/support/movie.h" +#include "titanic/titanic.h" +#include "common/str-array.h" namespace Titanic { diff --git a/engines/titanic/debugger.h b/engines/titanic/debugger.h index 36da1d33f4..3e53feec2a 100644 --- a/engines/titanic/debugger.h +++ b/engines/titanic/debugger.h @@ -23,16 +23,27 @@ #ifndef TITANIC_DEBUGGER_H #define TITANIC_DEBUGGER_H -#include "common/scummsys.h" #include "gui/debugger.h" -#include "titanic/core/room_item.h" -#include "titanic/core/node_item.h" -#include "titanic/core/view_item.h" +#include "common/scummsys.h" namespace Titanic { +#define DEBUG_BASIC 1 +#define DEBUG_INTERMEDIATE 2 +#define DEBUG_DETAILED 3 + +class CNodeItem; +class CRoomItem; +class CViewItem; class TitanicEngine; +enum TitanicDebugChannels { + kDebugCore = 1 << 0, + kDebugScripts = 1 << 1, + kDebugGraphics = 1 << 2, + kDebugStarfield = 1 << 3 +}; + class Debugger : public GUI::Debugger { private: /** diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp index 5fad72a9df..b33ac51bed 100644 --- a/engines/titanic/detection.cpp +++ b/engines/titanic/detection.cpp @@ -20,10 +20,10 @@ * */ -#include "titanic/titanic.h" #include "titanic/core/project_item.h" +#include "titanic/events.h" #include "titanic/support/simple_file.h" - +#include "titanic/titanic.h" #include "base/plugins.h" #include "common/savefile.h" #include "common/str-array.h" diff --git a/engines/titanic/events.cpp b/engines/titanic/events.cpp index f946f7b214..4cf7e77eff 100644 --- a/engines/titanic/events.cpp +++ b/engines/titanic/events.cpp @@ -20,14 +20,17 @@ * */ -#include "common/scummsys.h" -#include "common/events.h" -#include "common/system.h" -#include "engines/util.h" #include "titanic/events.h" -#include "titanic/titanic.h" +#include "titanic/debugger.h" +#include "titanic/game_manager.h" #include "titanic/main_game_window.h" #include "titanic/star_control/star_control.h" +#include "titanic/titanic.h" +#include "common/events.h" +#include "common/scummsys.h" +#include "common/system.h" +#include "engines/util.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp index 9ae2a0e99f..c2f181d529 100644 --- a/engines/titanic/game/missiveomat.cpp +++ b/engines/titanic/game/missiveomat.cpp @@ -22,6 +22,7 @@ #include "titanic/game/missiveomat.h" #include "titanic/core/room_item.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/music_console_button.cpp b/engines/titanic/game/music_console_button.cpp index 872202891c..5da4c74022 100644 --- a/engines/titanic/game/music_console_button.cpp +++ b/engines/titanic/game/music_console_button.cpp @@ -22,6 +22,7 @@ #include "titanic/game/music_console_button.h" #include "titanic/core/room_item.h" +#include "titanic/sound/music_room.h" #include "titanic/sound/music_room_handler.h" #include "titanic/titanic.h" diff --git a/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp index c32a06db39..a28e3017c9 100644 --- a/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp +++ b/engines/titanic/game/parrot/parrot_lobby_link_updater.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/parrot/parrot_lobby_link_updater.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/sgt/bedhead.cpp b/engines/titanic/game/sgt/bedhead.cpp index 756111bf11..7775ad38dc 100644 --- a/engines/titanic/game/sgt/bedhead.cpp +++ b/engines/titanic/game/sgt/bedhead.cpp @@ -21,6 +21,7 @@ */ #include "titanic/game/sgt/bedhead.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp index 80404fa9d3..7c1e33cce4 100644 --- a/engines/titanic/game/television.cpp +++ b/engines/titanic/game/television.cpp @@ -21,11 +21,11 @@ */ #include "titanic/game/television.h" -#include "titanic/game/get_lift_eye2.h" -#include "titanic/core/project_item.h" #include "titanic/carry/magazine.h" +#include "titanic/core/project_item.h" +#include "titanic/debugger.h" +#include "titanic/game/get_lift_eye2.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp index 17f1783494..2dfede3d63 100644 --- a/engines/titanic/game/transport/lift.cpp +++ b/engines/titanic/game/transport/lift.cpp @@ -21,9 +21,9 @@ */ #include "titanic/game/transport/lift.h" -#include "titanic/pet_control/pet_control.h" +#include "titanic/debugger.h" #include "titanic/moves/multi_move.h" -#include "titanic/titanic.h" +#include "titanic/pet_control/pet_control.h" namespace Titanic { diff --git a/engines/titanic/game/transport/lift_indicator.cpp b/engines/titanic/game/transport/lift_indicator.cpp index 37fa7a0dba..c0616a99aa 100644 --- a/engines/titanic/game/transport/lift_indicator.cpp +++ b/engines/titanic/game/transport/lift_indicator.cpp @@ -22,8 +22,8 @@ #include "titanic/game/transport/lift_indicator.h" #include "titanic/game/transport/lift.h" +#include "titanic/debugger.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game_manager.cpp b/engines/titanic/game_manager.cpp index 65a2a278c8..e5f46bc7b7 100644 --- a/engines/titanic/game_manager.cpp +++ b/engines/titanic/game_manager.cpp @@ -20,13 +20,16 @@ * */ -#include "titanic/titanic.h" #include "titanic/game_manager.h" -#include "titanic/game_view.h" -#include "titanic/support/screen_manager.h" #include "titanic/core/project_item.h" +#include "titanic/events.h" +#include "titanic/game_view.h" #include "titanic/messages/messages.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/sound/background_sound_maker.h" +#include "titanic/support/files_manager.h" +#include "titanic/support/screen_manager.h" +#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game_manager.h b/engines/titanic/game_manager.h index 0d740f6d75..89c40d0356 100644 --- a/engines/titanic/game_manager.h +++ b/engines/titanic/game_manager.h @@ -27,18 +27,24 @@ #include "titanic/game_state.h" #include "titanic/input_handler.h" #include "titanic/input_translator.h" -#include "titanic/support/simple_file.h" -#include "titanic/support/time_event_info.h" -#include "titanic/support/video_surface.h" -#include "titanic/true_talk/true_talk_manager.h" -#include "titanic/sound/background_sound_maker.h" +#include "titanic/support/time_event_info.h" // class CTimeEventInfo +#include "titanic/true_talk/true_talk_manager.h" // class CTrueTalkManager #include "titanic/sound/music_room.h" #include "titanic/sound/sound.h" namespace Titanic { -class CProjectItem; +class CBackgroundSoundMaker; class CGameView; +class CMovie; +class CMovieClip; +class CProjectItem; +class CRoomItem; +class CScreenManager; +class CTreeItem; +class CViewItem; +class CVideoSurface; +class SimpleFile; class CGameManager { private: diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp index 7ddd16ab22..9bb83cc03a 100644 --- a/engines/titanic/game_state.cpp +++ b/engines/titanic/game_state.cpp @@ -21,9 +21,11 @@ */ #include "titanic/game_state.h" -#include "titanic/titanic.h" +#include "titanic/game_view.h" +#include "titanic/events.h" #include "titanic/game_manager.h" #include "titanic/support/screen_manager.h" +#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/game_view.h b/engines/titanic/game_view.h index e17d72b472..d4a1be2c99 100644 --- a/engines/titanic/game_view.h +++ b/engines/titanic/game_view.h @@ -24,13 +24,15 @@ #define TITANIC_GAME_VIEW_H #include "common/scummsys.h" -#include "titanic/core/view_item.h" -#include "titanic/support/video_surface.h" namespace Titanic { class CMainGameWindow; class CGameManager; +class CResourceKey; +class CViewItem; +class CVideoSurface; +class Rect; class CGameView { protected: diff --git a/engines/titanic/gfx/text_control.cpp b/engines/titanic/gfx/text_control.cpp index f731dbb340..d1d2e1c530 100644 --- a/engines/titanic/gfx/text_control.cpp +++ b/engines/titanic/gfx/text_control.cpp @@ -21,6 +21,7 @@ */ #include "titanic/gfx/text_control.h" +#include "titanic/support/strings.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/gfx/text_control.h b/engines/titanic/gfx/text_control.h index d4ef19a7cf..ddcb791062 100644 --- a/engines/titanic/gfx/text_control.h +++ b/engines/titanic/gfx/text_control.h @@ -24,18 +24,22 @@ #define TITANIC_TEXT_CONTROL_H #include "common/keyboard.h" -#include "titanic/support/simple_file.h" #include "titanic/support/screen_manager.h" -#include "titanic/support/text_cursor.h" +#include "titanic/support/strings.h" namespace Titanic { +class CScreenManager; +class CTextCursor; +class SimpleFile; + class CTextControl { struct ArrayEntry { CString _line; CString _rgb; CString _string3; }; + private: Common::Array<ArrayEntry> _array; CString _lines; diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp index 8bd8bba9a9..9b9bacdc68 100644 --- a/engines/titanic/input_handler.cpp +++ b/engines/titanic/input_handler.cpp @@ -21,11 +21,14 @@ */ #include "titanic/input_handler.h" +#include "titanic/events.h" #include "titanic/game_manager.h" -#include "titanic/titanic.h" +#include "titanic/core/project_item.h" #include "titanic/messages/mouse_messages.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/support/files_manager.h" #include "titanic/support/screen_manager.h" +#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/input_handler.h b/engines/titanic/input_handler.h index 3fd93a2ac8..53b11f8cc4 100644 --- a/engines/titanic/input_handler.h +++ b/engines/titanic/input_handler.h @@ -23,13 +23,15 @@ #ifndef TITANIC_INPUT_HANDLER_H #define TITANIC_INPUT_HANDLER_H -#include "titanic/support/rect.h" -#include "titanic/input_translator.h" -#include "titanic/core/tree_item.h" +#include "titanic/support/rect.h" // Point namespace Titanic { +class CGameObject; class CGameManager; +class CInputTranslator; +class CMessage; +class CTreeItem; class CInputHandler { private: diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp index cfea98cdf1..2d98c813a6 100644 --- a/engines/titanic/main_game_window.cpp +++ b/engines/titanic/main_game_window.cpp @@ -20,14 +20,17 @@ * */ -#include "common/config-manager.h" -#include "titanic/titanic.h" +#include "titanic/main_game_window.h" #include "titanic/continue_save_dialog.h" +#include "titanic/debugger.h" #include "titanic/game_manager.h" #include "titanic/game_view.h" -#include "titanic/main_game_window.h" #include "titanic/messages/messages.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/support/files_manager.h" +#include "titanic/titanic.h" +#include "common/config-manager.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/main_game_window.h b/engines/titanic/main_game_window.h index e573217058..3e4d03e1fe 100644 --- a/engines/titanic/main_game_window.h +++ b/engines/titanic/main_game_window.h @@ -23,16 +23,21 @@ #ifndef TITANIC_MAIN_GAME_WINDOW_H #define TITANIC_MAIN_GAME_WINDOW_H -#include "common/scummsys.h" -#include "common/array.h" -#include "titanic/game_manager.h" -#include "titanic/game_view.h" -#include "titanic/support/image.h" #include "titanic/core/project_item.h" #include "titanic/events.h" +#include "common/array.h" +#include "common/scummsys.h" + +namespace Common { +class Point; +} namespace Titanic { +class CGameManager; +class CGameView; +class CScreenManager; +class Image; class TitanicEngine; class CMainGameWindow : public CEventTarget { diff --git a/engines/titanic/messages/bilge_dispensor_event.cpp b/engines/titanic/messages/bilge_dispensor_event.cpp index 336a1caf0d..c0bb289a00 100644 --- a/engines/titanic/messages/bilge_dispensor_event.cpp +++ b/engines/titanic/messages/bilge_dispensor_event.cpp @@ -21,6 +21,7 @@ */ #include "titanic/messages/bilge_dispensor_event.h" +#include "titanic/events.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/messages/messages.cpp b/engines/titanic/messages/messages.cpp index 83c09688c4..e082733763 100644 --- a/engines/titanic/messages/messages.cpp +++ b/engines/titanic/messages/messages.cpp @@ -21,10 +21,12 @@ */ #include "titanic/messages/messages.h" -#include "titanic/messages/mouse_messages.h" #include "titanic/core/game_object.h" #include "titanic/core/message_target.h" +#include "titanic/core/project_item.h" #include "titanic/core/tree_item.h" +#include "titanic/main_game_window.h" +#include "titanic/messages/mouse_messages.h" #include "titanic/pet_control/pet_control.h" #include "titanic/titanic.h" diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index 21644bc150..2ba150a38c 100644 --- a/engines/titanic/npcs/barbot.cpp +++ b/engines/titanic/npcs/barbot.cpp @@ -21,6 +21,7 @@ */ #include "titanic/npcs/barbot.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 002af21e9b..56420ba0de 100644 --- a/engines/titanic/npcs/bellbot.cpp +++ b/engines/titanic/npcs/bellbot.cpp @@ -23,8 +23,8 @@ #include "titanic/npcs/bellbot.h" #include "titanic/carry/carry.h" #include "titanic/core/room_item.h" +#include "titanic/game_manager.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp index a5e8542db0..8d8f7ed07a 100644 --- a/engines/titanic/npcs/callbot.cpp +++ b/engines/titanic/npcs/callbot.cpp @@ -22,6 +22,7 @@ #include "titanic/npcs/callbot.h" #include "titanic/core/room_item.h" +#include "titanic/game_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp index e8536c28a9..7567311ebb 100644 --- a/engines/titanic/npcs/doorbot.cpp +++ b/engines/titanic/npcs/doorbot.cpp @@ -22,7 +22,7 @@ #include "titanic/npcs/doorbot.h" #include "titanic/core/room_item.h" -#include "titanic/titanic.h" +#include "titanic/debugger.h" namespace Titanic { diff --git a/engines/titanic/npcs/true_talk_npc.cpp b/engines/titanic/npcs/true_talk_npc.cpp index c1b17950c6..d67fd3628e 100644 --- a/engines/titanic/npcs/true_talk_npc.cpp +++ b/engines/titanic/npcs/true_talk_npc.cpp @@ -22,9 +22,9 @@ #include "titanic/npcs/true_talk_npc.h" #include "titanic/core/view_item.h" -#include "titanic/pet_control/pet_control.h" +#include "titanic/debugger.h" #include "titanic/game_manager.h" -#include "titanic/titanic.h" +#include "titanic/pet_control/pet_control.h" namespace Titanic { diff --git a/engines/titanic/pet_control/pet_conversations.cpp b/engines/titanic/pet_control/pet_conversations.cpp index 37ff3d8e9f..8157e1ce82 100644 --- a/engines/titanic/pet_control/pet_conversations.cpp +++ b/engines/titanic/pet_control/pet_conversations.cpp @@ -22,6 +22,7 @@ #include "titanic/pet_control/pet_conversations.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/debugger.h" #include "titanic/game_manager.h" #include "titanic/titanic.h" diff --git a/engines/titanic/pet_control/pet_load.cpp b/engines/titanic/pet_control/pet_load.cpp index 81ea85874f..1d81435bed 100644 --- a/engines/titanic/pet_control/pet_load.cpp +++ b/engines/titanic/pet_control/pet_load.cpp @@ -21,9 +21,10 @@ */ #include "titanic/pet_control/pet_load.h" -#include "titanic/pet_control/pet_control.h" #include "titanic/core/project_item.h" #include "titanic/game_manager.h" +#include "titanic/main_game_window.h" +#include "titanic/pet_control/pet_control.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/pet_control/pet_remote_glyphs.cpp b/engines/titanic/pet_control/pet_remote_glyphs.cpp index 7aae879646..2bd87fcd64 100644 --- a/engines/titanic/pet_control/pet_remote_glyphs.cpp +++ b/engines/titanic/pet_control/pet_remote_glyphs.cpp @@ -21,9 +21,10 @@ */ #include "titanic/pet_control/pet_remote_glyphs.h" -#include "titanic/pet_control/pet_remote.h" -#include "titanic/pet_control/pet_control.h" +#include "titanic/game_manager.h" #include "titanic/messages/pet_messages.h" +#include "titanic/pet_control/pet_control.h" +#include "titanic/pet_control/pet_remote.h" #include "titanic/star_control/star_control.h" #include "titanic/support/strings.h" #include "titanic/titanic.h" diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.cpp b/engines/titanic/pet_control/pet_rooms_glyphs.cpp index 1a5d5e139e..c14b9e79e7 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.cpp +++ b/engines/titanic/pet_control/pet_rooms_glyphs.cpp @@ -21,10 +21,12 @@ */ #include "titanic/pet_control/pet_rooms_glyphs.h" +#include "titanic/events.h" #include "titanic/pet_control/pet_control.h" #include "titanic/pet_control/pet_section.h" -#include "titanic/support/screen_manager.h" #include "titanic/room_flags.h" +#include "titanic/support/screen_manager.h" +#include "titanic/support/simple_file.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/pet_control/pet_rooms_glyphs.h b/engines/titanic/pet_control/pet_rooms_glyphs.h index 3a43bdc06c..e10eafcd60 100644 --- a/engines/titanic/pet_control/pet_rooms_glyphs.h +++ b/engines/titanic/pet_control/pet_rooms_glyphs.h @@ -24,11 +24,12 @@ #define TITANIC_PET_ROOMS_GLYPHS_H #include "titanic/pet_control/pet_glyphs.h" -#include "titanic/support/simple_file.h" #include "titanic/game_location.h" namespace Titanic { +class SimpleFile; + enum RoomGlyphMode { RGM_UNASSIGNED = 0, RGM_ASSIGNED_ROOM = 1, RGM_PREV_ASSIGNED_ROOM = 2 }; diff --git a/engines/titanic/sound/music_room_handler.cpp b/engines/titanic/sound/music_room_handler.cpp index 76d7043d0c..dbbe4e4ca8 100644 --- a/engines/titanic/sound/music_room_handler.cpp +++ b/engines/titanic/sound/music_room_handler.cpp @@ -22,6 +22,7 @@ #include "titanic/sound/music_room_handler.h" #include "titanic/sound/sound_manager.h" +#include "titanic/events.h" #include "titanic/core/project_item.h" #include "titanic/titanic.h" diff --git a/engines/titanic/sound/music_song.cpp b/engines/titanic/sound/music_song.cpp index a5527da356..ea5f29a536 100644 --- a/engines/titanic/sound/music_song.cpp +++ b/engines/titanic/sound/music_song.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/music_song.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" #include "common/util.h" diff --git a/engines/titanic/sound/qmixer.cpp b/engines/titanic/sound/qmixer.cpp index beb1502ab4..a3c06da2f8 100644 --- a/engines/titanic/sound/qmixer.cpp +++ b/engines/titanic/sound/qmixer.cpp @@ -20,9 +20,9 @@ * */ -#include "common/system.h" #include "titanic/sound/qmixer.h" -#include "titanic/titanic.h" +#include "titanic/debugger.h" +#include "common/system.h" namespace Titanic { diff --git a/engines/titanic/sound/sound_manager.cpp b/engines/titanic/sound/sound_manager.cpp index 4b5887b1e7..a4d838ce2f 100644 --- a/engines/titanic/sound/sound_manager.cpp +++ b/engines/titanic/sound/sound_manager.cpp @@ -21,6 +21,7 @@ */ #include "titanic/sound/sound_manager.h" +#include "titanic/events.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp index c22260ea98..9e182f9c75 100644 --- a/engines/titanic/star_control/base_stars.cpp +++ b/engines/titanic/star_control/base_stars.cpp @@ -23,6 +23,7 @@ #include "titanic/star_control/base_stars.h" #include "titanic/star_control/star_camera.h" #include "titanic/star_control/star_ref.h" +#include "titanic/support/files_manager.h" #include "titanic/support/simple_file.h" #include "titanic/titanic.h" diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp index 68427a3452..6b4527e79d 100644 --- a/engines/titanic/star_control/star_camera.cpp +++ b/engines/titanic/star_control/star_camera.cpp @@ -21,6 +21,7 @@ */ #include "titanic/star_control/star_camera.h" +#include "titanic/debugger.h" #include "titanic/star_control/camera_mover.h" #include "titanic/star_control/daffine.h" #include "titanic/star_control/fmatrix.h" diff --git a/engines/titanic/star_control/star_field_base.cpp b/engines/titanic/star_control/star_field_base.cpp index 7641e4a951..4df27bec29 100644 --- a/engines/titanic/star_control/star_field_base.cpp +++ b/engines/titanic/star_control/star_field_base.cpp @@ -21,8 +21,8 @@ */ #include "titanic/star_control/star_field_base.h" +#include "titanic/debugger.h" #include "titanic/star_control/star_camera.h" -#include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_points1.cpp b/engines/titanic/star_control/star_points1.cpp index 91bcf953a8..44ff9e1d5e 100644 --- a/engines/titanic/star_control/star_points1.cpp +++ b/engines/titanic/star_control/star_points1.cpp @@ -22,6 +22,7 @@ #include "titanic/star_control/star_points1.h" #include "titanic/star_control/star_camera.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/star_points2.cpp b/engines/titanic/star_control/star_points2.cpp index 2d239038bd..7d45dfc055 100644 --- a/engines/titanic/star_control/star_points2.cpp +++ b/engines/titanic/star_control/star_points2.cpp @@ -22,6 +22,7 @@ #include "titanic/star_control/star_points2.h" #include "titanic/star_control/star_camera.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/star_control/unmarked_camera_mover.cpp b/engines/titanic/star_control/unmarked_camera_mover.cpp index ce42b3949d..644c946bb3 100644 --- a/engines/titanic/star_control/unmarked_camera_mover.cpp +++ b/engines/titanic/star_control/unmarked_camera_mover.cpp @@ -21,11 +21,12 @@ */ #include "titanic/star_control/unmarked_camera_mover.h" +#include "titanic/debugger.h" #include "titanic/star_control/dvector.h" #include "titanic/star_control/daffine.h" #include "titanic/star_control/error_code.h" -#include "common/textconsole.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/star_control/viewport.cpp b/engines/titanic/star_control/viewport.cpp index 529b4bec3a..32f17f4f1c 100644 --- a/engines/titanic/star_control/viewport.cpp +++ b/engines/titanic/star_control/viewport.cpp @@ -21,6 +21,7 @@ */ #include "titanic/star_control/viewport.h" +#include "titanic/debugger.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp index 7673c37c37..a7d6ef5fb6 100644 --- a/engines/titanic/support/avi_surface.cpp +++ b/engines/titanic/support/avi_surface.cpp @@ -20,13 +20,15 @@ * */ -#include "common/system.h" -#include "graphics/pixelformat.h" -#include "video/avi_decoder.h" #include "titanic/support/avi_surface.h" #include "titanic/support/screen_manager.h" #include "titanic/support/video_surface.h" +#include "titanic/events.h" #include "titanic/titanic.h" +#include "common/system.h" +#include "graphics/pixelformat.h" +#include "graphics/screen.h" +#include "video/avi_decoder.h" namespace Titanic { diff --git a/engines/titanic/support/credit_text.cpp b/engines/titanic/support/credit_text.cpp index 6ee17a2b95..fa30bce988 100644 --- a/engines/titanic/support/credit_text.cpp +++ b/engines/titanic/support/credit_text.cpp @@ -21,6 +21,10 @@ */ #include "titanic/support/credit_text.h" +#include "titanic/core/game_object.h" +#include "titanic/events.h" +#include "titanic/support/files_manager.h" +#include "titanic/support/screen_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/support/direct_draw.cpp b/engines/titanic/support/direct_draw.cpp index 9fbfe0c5ee..71a90ad00d 100644 --- a/engines/titanic/support/direct_draw.cpp +++ b/engines/titanic/support/direct_draw.cpp @@ -20,11 +20,13 @@ * */ +#include "titanic/support/direct_draw.h" +#include "titanic/debugger.h" +#include "titanic/titanic.h" #include "common/debug.h" #include "engines/util.h" #include "graphics/pixelformat.h" -#include "titanic/support/direct_draw.h" -#include "titanic/titanic.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/support/image.cpp b/engines/titanic/support/image.cpp index 2da2179af0..1993f44c4c 100644 --- a/engines/titanic/support/image.cpp +++ b/engines/titanic/support/image.cpp @@ -21,6 +21,7 @@ */ #include "titanic/support/image.h" +#include "titanic/support/files_manager.h" #include "image/bmp.h" #include "titanic/titanic.h" diff --git a/engines/titanic/support/mouse_cursor.cpp b/engines/titanic/support/mouse_cursor.cpp index eb58296502..1c5e0da487 100644 --- a/engines/titanic/support/mouse_cursor.cpp +++ b/engines/titanic/support/mouse_cursor.cpp @@ -20,11 +20,16 @@ * */ -#include "graphics/cursorman.h" #include "titanic/support/mouse_cursor.h" +#include "titanic/support/screen_manager.h" #include "titanic/support/transparency_surface.h" #include "titanic/support/video_surface.h" +#include "titanic/events.h" +#include "titanic/input_handler.h" +#include "titanic/messages/mouse_messages.h" #include "titanic/titanic.h" +#include "graphics/cursorman.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/support/movie.cpp b/engines/titanic/support/movie.cpp index a57a84d5b0..56e7b7e6f2 100644 --- a/engines/titanic/support/movie.cpp +++ b/engines/titanic/support/movie.cpp @@ -21,9 +21,13 @@ */ #include "titanic/support/movie.h" +#include "titanic/core/game_object.h" +#include "titanic/events.h" +#include "titanic/messages/messages.h" #include "titanic/support/avi_surface.h" +#include "titanic/support/screen_manager.h" +#include "titanic/support/video_surface.h" #include "titanic/sound/sound_manager.h" -#include "titanic/messages/messages.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/support/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp index 3082344216..29cca4fc33 100644 --- a/engines/titanic/support/screen_manager.cpp +++ b/engines/titanic/support/screen_manager.cpp @@ -23,6 +23,7 @@ #include "titanic/support/screen_manager.h" #include "titanic/support/video_surface.h" #include "titanic/titanic.h" +#include "graphics/screen.h" namespace Titanic { diff --git a/engines/titanic/support/strings.cpp b/engines/titanic/support/strings.cpp index a8ab45800f..5ef2a6c6ac 100644 --- a/engines/titanic/support/strings.cpp +++ b/engines/titanic/support/strings.cpp @@ -21,6 +21,7 @@ */ #include "titanic/support/strings.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/support/text_cursor.cpp b/engines/titanic/support/text_cursor.cpp index 1da98c1cf7..bf41fd30fb 100644 --- a/engines/titanic/support/text_cursor.cpp +++ b/engines/titanic/support/text_cursor.cpp @@ -20,10 +20,11 @@ * */ -#include "common/textconsole.h" #include "titanic/support/text_cursor.h" +#include "titanic/events.h" #include "titanic/support/screen_manager.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/titanic.cpp b/engines/titanic/titanic.cpp index f6c4c562ef..de28e073a9 100644 --- a/engines/titanic/titanic.cpp +++ b/engines/titanic/titanic.cpp @@ -20,32 +20,38 @@ * */ -#include "common/scummsys.h" -#include "common/archive.h" -#include "common/config-manager.h" -#include "common/debug-channels.h" -#include "common/events.h" -#include "common/translation.h" -#include "engines/util.h" -#include "graphics/scaler.h" -#include "graphics/thumbnail.h" -#include "gui/saveload.h" #include "titanic/titanic.h" -#include "titanic/debugger.h" #include "titanic/carry/hose.h" #include "titanic/core/saveable_object.h" +#include "titanic/debugger.h" +#include "titanic/events.h" +#include "titanic/game_manager.h" #include "titanic/game/get_lift_eye2.h" #include "titanic/game/television.h" #include "titanic/game/parrot/parrot_lobby_object.h" #include "titanic/game/sgt/sgt_navigation.h" #include "titanic/game/sgt/sgt_state_room.h" +#include "titanic/main_game_window.h" #include "titanic/moves/enter_exit_first_class_state.h" #include "titanic/moves/enter_exit_sec_class_mini_lift.h" #include "titanic/moves/exit_pellerator.h" #include "titanic/pet_control/pet_control.h" +#include "titanic/sound/music_room.h" #include "titanic/sound/music_room_instrument.h" +#include "titanic/support/files_manager.h" #include "titanic/support/simple_file.h" #include "titanic/true_talk/tt_npc_script.h" +#include "common/archive.h" +#include "common/config-manager.h" +#include "common/debug-channels.h" +#include "common/events.h" +#include "common/scummsys.h" +#include "common/translation.h" +#include "engines/util.h" +#include "graphics/scaler.h" +#include "graphics/thumbnail.h" +#include "graphics/screen.h" +#include "gui/saveload.h" namespace Titanic { diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h index 4742f51d82..cf0a4d3c67 100644 --- a/engines/titanic/titanic.h +++ b/engines/titanic/titanic.h @@ -23,23 +23,13 @@ #ifndef TITANIC_TITANIC_H #define TITANIC_TITANIC_H -#include "common/scummsys.h" -#include "common/random.h" -#include "common/str-array.h" -#include "common/system.h" -#include "common/serializer.h" -#include "engines/advancedDetector.h" -#include "engines/engine.h" -#include "graphics/screen.h" -#include "titanic/debugger.h" -#include "titanic/events.h" -#include "titanic/support/files_manager.h" -#include "titanic/main_game_window.h" -#include "titanic/support/exe_resources.h" -#include "titanic/support/movie_manager.h" -#include "titanic/support/screen_manager.h" -#include "titanic/support/string.h" -#include "titanic/true_talk/tt_script_base.h" +#include "common/random.h" // getRandomNumber and getRandomFloat +#include "engines/engine.h" // class Engine +#include "titanic/support/exe_resources.h" // class CExeResources +#include "titanic/support/movie_manager.h" // class CMovieManager +#include "titanic/support/string.h" // class StringArray; +#include "titanic/support/strings.h" // class Strings; +#include "common/language.h" // Language enum /** * This is the namespace of the Titanic engine. @@ -49,24 +39,25 @@ * Games using this engine: * - Starship Titanic */ -namespace Titanic { -enum TitanicDebugChannels { - kDebugCore = 1 << 0, - kDebugScripts = 1 << 1, - kDebugGraphics = 1 << 2, - kDebugStarfield = 1 << 3 -}; +class OSystem; + +namespace Graphics { +class Screen; +} + +namespace Common { +class Error; +class FSNode; +} + +namespace Titanic { #define TITANIC_SAVEGAME_VERSION 1 #define SCREEN_WIDTH 640 #define SCREEN_HEIGHT 480 -#define DEBUG_BASIC 1 -#define DEBUG_INTERMEDIATE 2 -#define DEBUG_DETAILED 3 - #define TOTAL_ITEMS 46 #define TOTAL_ROOMS 34 @@ -80,8 +71,16 @@ enum TitanicDebugChannels { // the game redundantly suggest removing the fuse, which is wrong //#define FIX_DISPENSOR_TEMPATURE +class CFilesManager; +class CMainGameWindow; +class CString; +class CTrueTalkManager; +class Debugger; +class Events; +class OSScreenManager; +class CScriptHandler; +class TTscriptBase; struct TitanicGameDescription; -class TitanicEngine; class TitanicEngine : public Engine { private: @@ -172,12 +171,12 @@ public: bool isGerman() const { return getLanguage() == Common::DE_DEU; } /** - * Gets a random number + * Returns a uniform random unsigned integer in the interval [0, max] */ uint getRandomNumber(uint max) { return _randomSource.getRandomNumber(max); } /** - * Returns a random floating point number between 0.0 to 65535.0 + * Returns a uniform random floating point number in the interval [0.0, 65535.0] */ double getRandomFloat() { return getRandomNumber(0xfffffffe) * 0.000015259022; } diff --git a/engines/titanic/true_talk/parrot_script.cpp b/engines/titanic/true_talk/parrot_script.cpp index 95ebbb5bfb..b3f25d0056 100644 --- a/engines/titanic/true_talk/parrot_script.cpp +++ b/engines/titanic/true_talk/parrot_script.cpp @@ -20,9 +20,10 @@ * */ -#include "common/textconsole.h" #include "titanic/true_talk/parrot_script.h" +#include "titanic/true_talk/true_talk_manager.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/true_talk/script_handler.cpp b/engines/titanic/true_talk/script_handler.cpp index be0b89bc65..f716a96130 100644 --- a/engines/titanic/true_talk/script_handler.cpp +++ b/engines/titanic/true_talk/script_handler.cpp @@ -21,9 +21,10 @@ */ #include "titanic/true_talk/script_handler.h" +#include "titanic/true_talk/title_engine.h" #include "titanic/true_talk/tt_concept.h" -#include "titanic/true_talk/tt_sentence.h" #include "titanic/true_talk/tt_parser.h" +#include "titanic/true_talk/tt_sentence.h" #include "titanic/true_talk/tt_word.h" #include "titanic/titanic.h" diff --git a/engines/titanic/true_talk/script_support.cpp b/engines/titanic/true_talk/script_support.cpp index 52676139f0..bba708fb78 100644 --- a/engines/titanic/true_talk/script_support.cpp +++ b/engines/titanic/true_talk/script_support.cpp @@ -21,6 +21,7 @@ */ #include "titanic/true_talk/script_support.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/true_talk/title_engine.cpp b/engines/titanic/true_talk/title_engine.cpp index bfa97e3f92..23327014d6 100644 --- a/engines/titanic/true_talk/title_engine.cpp +++ b/engines/titanic/true_talk/title_engine.cpp @@ -21,6 +21,7 @@ */ #include "titanic/true_talk/title_engine.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" namespace Titanic { diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index a713688854..e2e411559f 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -22,8 +22,8 @@ #include "titanic/true_talk/true_talk_manager.h" #include "titanic/core/tree_item.h" -#include "titanic/npcs/true_talk_npc.h" #include "titanic/game_manager.h" +#include "titanic/npcs/true_talk_npc.h" #include "titanic/titanic.h" #define MKTAG_BE(a3,a2,a1,a0) ((uint32)((a3) | ((a2) << 8) | ((a1) << 16) | ((a0) << 24))) diff --git a/engines/titanic/true_talk/tt_concept.cpp b/engines/titanic/true_talk/tt_concept.cpp index b7ad0b3690..a1bb1bcc32 100644 --- a/engines/titanic/true_talk/tt_concept.cpp +++ b/engines/titanic/true_talk/tt_concept.cpp @@ -21,6 +21,7 @@ */ #include "titanic/true_talk/tt_concept.h" +#include "titanic/true_talk/script_handler.h" #include "titanic/true_talk/tt_script_base.h" #include "titanic/true_talk/tt_word.h" #include "titanic/titanic.h" diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp index f12d02c05f..2140f45203 100644 --- a/engines/titanic/true_talk/tt_npc_script.cpp +++ b/engines/titanic/true_talk/tt_npc_script.cpp @@ -20,15 +20,17 @@ * */ -#include "common/algorithm.h" -#include "common/textconsole.h" +#include "titanic/true_talk/tt_npc_script.h" +#include "titanic/core/project_item.h" +#include "titanic/game_manager.h" #include "titanic/messages/messages.h" #include "titanic/pet_control/pet_control.h" -#include "titanic/true_talk/tt_npc_script.h" +#include "titanic/support/files_manager.h" #include "titanic/true_talk/tt_sentence.h" #include "titanic/true_talk/true_talk_manager.h" -#include "titanic/game_manager.h" #include "titanic/titanic.h" +#include "common/algorithm.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_parser.cpp b/engines/titanic/true_talk/tt_parser.cpp index 8c8157370a..49f233888b 100644 --- a/engines/titanic/true_talk/tt_parser.cpp +++ b/engines/titanic/true_talk/tt_parser.cpp @@ -21,7 +21,9 @@ */ #include "titanic/true_talk/tt_parser.h" +#include "titanic/support/files_manager.h" #include "titanic/true_talk/script_handler.h" +#include "titanic/true_talk/true_talk_manager.h" #include "titanic/true_talk/tt_action.h" #include "titanic/true_talk/tt_concept.h" #include "titanic/true_talk/tt_picture.h" diff --git a/engines/titanic/true_talk/tt_quotes.cpp b/engines/titanic/true_talk/tt_quotes.cpp index c1a1e16eea..2857a7bc6c 100644 --- a/engines/titanic/true_talk/tt_quotes.cpp +++ b/engines/titanic/true_talk/tt_quotes.cpp @@ -20,9 +20,10 @@ * */ -#include "common/algorithm.h" #include "titanic/true_talk/tt_quotes.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" +#include "common/algorithm.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_quotes_tree.cpp b/engines/titanic/true_talk/tt_quotes_tree.cpp index e2293887a8..7fe3fe2b19 100644 --- a/engines/titanic/true_talk/tt_quotes_tree.cpp +++ b/engines/titanic/true_talk/tt_quotes_tree.cpp @@ -20,9 +20,10 @@ * */ -#include "common/algorithm.h" #include "titanic/true_talk/tt_quotes_tree.h" +#include "titanic/support/files_manager.h" #include "titanic/titanic.h" +#include "common/algorithm.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_script_base.cpp b/engines/titanic/true_talk/tt_script_base.cpp index 5162f4dde6..7df8153098 100644 --- a/engines/titanic/true_talk/tt_script_base.cpp +++ b/engines/titanic/true_talk/tt_script_base.cpp @@ -20,9 +20,10 @@ * */ -#include "common/textconsole.h" #include "titanic/true_talk/tt_script_base.h" +#include "titanic/true_talk/script_handler.h" #include "titanic/titanic.h" +#include "common/textconsole.h" namespace Titanic { diff --git a/engines/titanic/true_talk/tt_vocab.cpp b/engines/titanic/true_talk/tt_vocab.cpp index 97a1cbb90a..20df6bd4bb 100644 --- a/engines/titanic/true_talk/tt_vocab.cpp +++ b/engines/titanic/true_talk/tt_vocab.cpp @@ -20,15 +20,15 @@ *
*/
-#include "common/file.h"
#include "titanic/true_talk/tt_vocab.h"
-#include "titanic/true_talk/tt_adj.h"
+#include "titanic/true_talk/script_handler.h"
#include "titanic/true_talk/tt_action.h"
#include "titanic/true_talk/tt_adj.h"
#include "titanic/true_talk/tt_major_word.h"
#include "titanic/true_talk/tt_picture.h"
#include "titanic/true_talk/tt_pronoun.h"
#include "titanic/titanic.h"
+#include "common/file.h"
namespace Titanic {
|