diff options
87 files changed, 370 insertions, 349 deletions
diff --git a/engines/pink/archive.cpp b/engines/pink/archive.cpp index 2cb607ba0a..6b442ae630 100644 --- a/engines/pink/archive.cpp +++ b/engines/pink/archive.cpp @@ -20,33 +20,31 @@ * */ -#include <common/debug.h> -#include <common/file.h> -#include <engines/pink/objects/object.h> -#include <engines/pink/objects/module.h> -#include <engines/pink/objects/pages/game_page.h> -#include <engines/pink/objects/actors/lead_actor.h> -#include <engines/pink/objects/condition.h> -#include <engines/pink/objects/side_effect.h> -#include <engines/pink/objects/sequences/sequence_item.h> -#include <engines/pink/objects/sequences/sequence.h> -#include <engines/pink/objects/handlers/handler.h> -#include <engines/pink/objects/actions/action_play.h> -#include <engines/pink/objects/actions/action_sound.h> -#include <engines/pink/objects/actions/action_hide.h> -#include <engines/pink/objects/walk/walk_location.h> -#include <engines/pink/objects/actions/walk_action.h> -#include <engines/pink/objects/actors/supporting_actor.h> -#include <engines/pink/objects/sequences/seq_timer.h> -#include <engines/pink/objects/actions/action_loop.h> -#include <engines/pink/objects/actions/action_play_with_sfx.h> -#include <engines/pink/objects/actions/action_talk.h> -#include <engines/pink/objects/actions/action_text.h> -#include <engines/pink/objects/actors/cursor_actor.h> -#include <engines/pink/objects/handlers/handler_timer.h> -#include <engines/pink/objects/actors/inventory_actor.h> -#include <engines/pink/objects/actors/audio_info_pda_button.h> -#include <engines/pink/objects/actors/pda_button_actor.h> +#include "common/debug.h" +#include "common/file.h" + +#include "pink/objects/condition.h" +#include "pink/objects/module.h" +#include "pink/objects/side_effect.h" +#include "pink/objects/actions/action_hide.h" +#include "pink/objects/actions/action_play_with_sfx.h" +#include "pink/objects/actions/action_sound.h" +#include "pink/objects/actions/action_talk.h" +#include "pink/objects/actions/action_text.h" +#include "pink/objects/actions/walk_action.h" +#include "pink/objects/actors/audio_info_pda_button.h" +#include "pink/objects/actors/cursor_actor.h" +#include "pink/objects/actors/inventory_actor.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/actors/pda_button_actor.h" +#include "pink/objects/actors/supporting_actor.h" +#include "pink/objects/handlers/handler.h" +#include "pink/objects/handlers/handler_timer.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/seq_timer.h" +#include "pink/objects/sequences/sequence.h" +#include "pink/objects/sequences/sequence_item.h" +#include "pink/objects/walk/walk_location.h" namespace Pink { diff --git a/engines/pink/archive.h b/engines/pink/archive.h index b74b0f52da..6b74c145e6 100644 --- a/engines/pink/archive.h +++ b/engines/pink/archive.h @@ -23,10 +23,11 @@ #ifndef PINK_ARCHIVE_H #define PINK_ARCHIVE_H -#include <engines/pink/objects/object.h> -#include <common/str-array.h> -#include "common/stream.h" #include "common/hash-str.h" +#include "common/str-array.h" +#include "common/stream.h" + +#include "pink/objects/object.h" namespace Common { diff --git a/engines/pink/cel_decoder.cpp b/engines/pink/cel_decoder.cpp index e143885491..ad0a7ac7da 100644 --- a/engines/pink/cel_decoder.cpp +++ b/engines/pink/cel_decoder.cpp @@ -20,9 +20,11 @@ * */ -#include <common/stream.h> -#include <graphics/surface.h> -#include "cel_decoder.h" +#include "common/stream.h" + +#include "graphics/surface.h" + +#include "pink/cel_decoder.h" namespace Pink { diff --git a/engines/pink/cel_decoder.h b/engines/pink/cel_decoder.h index d49c6e22e4..7ae9129ba8 100644 --- a/engines/pink/cel_decoder.h +++ b/engines/pink/cel_decoder.h @@ -23,8 +23,7 @@ #ifndef PINK_CEL_DECODER_H #define PINK_CEL_DECODER_H - -#include <video/flic_decoder.h> +#include "video/flic_decoder.h" namespace Pink { diff --git a/engines/pink/cursor_mgr.cpp b/engines/pink/cursor_mgr.cpp index 00259b7241..b42ef745c5 100644 --- a/engines/pink/cursor_mgr.cpp +++ b/engines/pink/cursor_mgr.cpp @@ -20,12 +20,12 @@ * */ -#include <engines/pink/objects/actors/actor.h> -#include <engines/pink/objects/actions/action_cel.h> -#include <engines/pink/cel_decoder.h> -#include "cursor_mgr.h" -#include "pink.h" -#include "objects/pages/game_page.h" +#include "pink/pink.h" +#include "pink/cel_decoder.h" +#include "pink/cursor_mgr.h" +#include "pink/objects/actions/action_cel.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/cursor_mgr.h b/engines/pink/cursor_mgr.h index 1a0094d689..c873010681 100644 --- a/engines/pink/cursor_mgr.h +++ b/engines/pink/cursor_mgr.h @@ -23,9 +23,11 @@ #ifndef PINK_CURSOR_MGR_H #define PINK_CURSOR_MGR_H -#include <graphics/wincursor.h> -#include <engines/pink/objects/object.h> -#include <common/rect.h> +#include "common/rect.h" + +#include "graphics/wincursor.h" + +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp index d3a7a08a21..546dd21592 100644 --- a/engines/pink/detection.cpp +++ b/engines/pink/detection.cpp @@ -20,9 +20,9 @@ * */ -#include <gui/EventRecorder.h> -#include "pink.h" +#include "gui/EventRecorder.h" +#include "pink/pink.h" static const PlainGameDescriptor pinkGames[] = { {"peril", "The Pink Panther: Passport to Peril"}, diff --git a/engines/pink/detection_tables.h b/engines/pink/detection_tables.h index a59e4e371a..5d31233719 100644 --- a/engines/pink/detection_tables.h +++ b/engines/pink/detection_tables.h @@ -23,7 +23,7 @@ #ifndef PINK_DETECTION_TABLES_H #define PINK_DETECTION_TABLES_H -#include <gui/EventRecorder.h> +#include "gui/EventRecorder.h" namespace Pink { diff --git a/engines/pink/director.cpp b/engines/pink/director.cpp index d92269e95a..fb5a0344f7 100644 --- a/engines/pink/director.cpp +++ b/engines/pink/director.cpp @@ -20,12 +20,13 @@ * */ -#include "director.h" -#include <engines/pink/objects/actions/action_sound.h> -#include <engines/pink/objects/actions/action_cel.h> -#include <graphics/managed_surface.h> +#include "graphics/managed_surface.h" #include "graphics/palette.h" -#include "cel_decoder.h" + +#include "pink/cel_decoder.h" +#include "pink/director.h" +#include "pink/objects/actions/action_sound.h" +#include "pink/objects/actions/action_cel.h" namespace Pink { Director::Director(OSystem *system) diff --git a/engines/pink/director.h b/engines/pink/director.h index 2fc042c228..c2decd0a66 100644 --- a/engines/pink/director.h +++ b/engines/pink/director.h @@ -23,9 +23,9 @@ #ifndef PINK_DIRECTOR_H #define PINK_DIRECTOR_H -#include <common/array.h> -#include <common/system.h> -#include <common/rect.h> +#include "common/array.h" +#include "common/rect.h" +#include "common/system.h" namespace Pink { diff --git a/engines/pink/file.cpp b/engines/pink/file.cpp index 8db4542615..9067b7240e 100644 --- a/engines/pink/file.cpp +++ b/engines/pink/file.cpp @@ -20,9 +20,10 @@ * */ -#include <common/str.h> -#include "engines/pink/objects/pages/game_page.h" -#include "pink.h" +#include "common/str.h" + +#include "pink/pink.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/file.h b/engines/pink/file.h index 0e78eeb290..dbcfaae314 100644 --- a/engines/pink/file.h +++ b/engines/pink/file.h @@ -23,7 +23,7 @@ #ifndef PINK_FILE_H #define PINK_FILE_H -#include <common/file.h> +#include "common/file.h" namespace Pink { diff --git a/engines/pink/objects/actions/action.cpp b/engines/pink/objects/actions/action.cpp index 0853e377aa..c6398833ae 100644 --- a/engines/pink/objects/actions/action.cpp +++ b/engines/pink/objects/actions/action.cpp @@ -20,9 +20,9 @@ * */ -#include "action.h" -#include "engines/pink/objects/actors/actor.h" -#include "engines/pink/archive.h" +#include "pink/archive.h" +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actions/action.h b/engines/pink/objects/actions/action.h index ae3b0838d4..0d57fbb129 100644 --- a/engines/pink/objects/actions/action.h +++ b/engines/pink/objects/actions/action.h @@ -23,7 +23,7 @@ #ifndef PINK_ACTION_H #define PINK_ACTION_H -#include "engines/pink/objects/object.h" +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_cel.cpp b/engines/pink/objects/actions/action_cel.cpp index 33e8823429..e878c3e0ae 100644 --- a/engines/pink/objects/actions/action_cel.cpp +++ b/engines/pink/objects/actions/action_cel.cpp @@ -20,14 +20,14 @@ * */ -#include <common/debug.h> -#include "action_cel.h" -#include <pink/objects/actors/actor.h> -#include <graphics/surface.h> -#include "engines/pink/archive.h" -#include "engines/pink/objects/pages/game_page.h" -#include "pink/pink.h" +#include "common/debug.h" + +#include "pink/archive.h" #include "pink/cel_decoder.h" +#include "pink/pink.h" +#include "pink/objects/actions/action_cel.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_cel.h b/engines/pink/objects/actions/action_cel.h index a86eadcd70..937c23bc08 100644 --- a/engines/pink/objects/actions/action_cel.h +++ b/engines/pink/objects/actions/action_cel.h @@ -23,8 +23,7 @@ #ifndef PINK_ACTION_CEL_H #define PINK_ACTION_CEL_H -#include <video/flic_decoder.h> -#include "action.h" +#include "pink/objects/actions/action.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_hide.cpp b/engines/pink/objects/actions/action_hide.cpp index ed2c903f1d..6678d937a9 100644 --- a/engines/pink/objects/actions/action_hide.cpp +++ b/engines/pink/objects/actions/action_hide.cpp @@ -20,10 +20,9 @@ * */ -#include "action_hide.h" -#include "engines/pink/objects/actors/actor.h" -#include <engines/pink/archive.h> - +#include "pink/archive.h" +#include "pink/objects/actions/action_hide.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_hide.h b/engines/pink/objects/actions/action_hide.h index bc62a5fc5f..a7c23a4b15 100644 --- a/engines/pink/objects/actions/action_hide.h +++ b/engines/pink/objects/actions/action_hide.h @@ -23,7 +23,7 @@ #ifndef PINK_ACTION_HIDE_H #define PINK_ACTION_HIDE_H -#include "action.h" +#include "pink/objects/actions/action.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_loop.cpp b/engines/pink/objects/actions/action_loop.cpp index b9e8600084..2c46b61b48 100644 --- a/engines/pink/objects/actions/action_loop.cpp +++ b/engines/pink/objects/actions/action_loop.cpp @@ -20,11 +20,10 @@ * */ - -#include "action_loop.h" -#include <pink/archive.h> -#include <pink/objects/actors/actor.h> -#include <pink/cel_decoder.h> +#include "pink/archive.h" +#include "pink/cel_decoder.h" +#include "pink/objects/actions/action_loop.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_loop.h b/engines/pink/objects/actions/action_loop.h index b8f5be352f..12c9e2dd88 100644 --- a/engines/pink/objects/actions/action_loop.h +++ b/engines/pink/objects/actions/action_loop.h @@ -23,7 +23,7 @@ #ifndef PINK_ACTION_LOOP_H #define PINK_ACTION_LOOP_H -#include "action_play.h" +#include "pink/objects/actions/action_play.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_play.cpp b/engines/pink/objects/actions/action_play.cpp index bf73e8d014..8c0be27b39 100644 --- a/engines/pink/objects/actions/action_play.cpp +++ b/engines/pink/objects/actions/action_play.cpp @@ -20,11 +20,12 @@ * */ -#include <common/debug.h> -#include "action_play.h" -#include "../actors/actor.h" -#include "engines/pink/archive.h" +#include "common/debug.h" + +#include "pink/archive.h" #include "pink/cel_decoder.h" +#include "pink/objects/actions/action_play.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_play.h b/engines/pink/objects/actions/action_play.h index 1d519a8f09..83318b0c1e 100644 --- a/engines/pink/objects/actions/action_play.h +++ b/engines/pink/objects/actions/action_play.h @@ -23,8 +23,7 @@ #ifndef PINK_ACTION_PLAY_H #define PINK_ACTION_PLAY_H -#include "action.h" -#include "action_still.h" +#include "pink/objects/actions/action_still.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp index a724dabe9a..b43b498eeb 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.cpp +++ b/engines/pink/objects/actions/action_play_with_sfx.cpp @@ -20,11 +20,11 @@ * */ -#include "action_play_with_sfx.h" -#include <pink/objects/pages/game_page.h> -#include <pink/sound.h> -#include <pink/objects/actors/actor.h> -#include <pink/cel_decoder.h> +#include "pink/cel_decoder.h" +#include "pink/sound.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/actions/action_play_with_sfx.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_play_with_sfx.h b/engines/pink/objects/actions/action_play_with_sfx.h index 9a1b069142..44b33420c7 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.h +++ b/engines/pink/objects/actions/action_play_with_sfx.h @@ -23,8 +23,9 @@ #ifndef PINK_ACTION_PLAY_WITH_SFX_H #define PINK_ACTION_PLAY_WITH_SFX_H -#include <common/array.h> -#include "action_play.h" +#include "common/array.h" + +#include "pink/objects/actions/action_play.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_sound.cpp b/engines/pink/objects/actions/action_sound.cpp index af14fce0c5..a125ec0a2e 100644 --- a/engines/pink/objects/actions/action_sound.cpp +++ b/engines/pink/objects/actions/action_sound.cpp @@ -20,14 +20,14 @@ * */ -#include <common/debug.h> -#include "action_sound.h" -#include "engines/pink/archive.h" -#include <engines/pink/objects/actors/actor.h> -#include <engines/pink/objects/pages/game_page.h> -#include <engines/pink/sound.h> -#include "engines/pink/pink.h" - +#include "common/debug.h" + +#include "pink/archive.h" +#include "pink/pink.h" +#include "pink/sound.h" +#include "pink/objects/actions/action_sound.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_sound.h b/engines/pink/objects/actions/action_sound.h index e96c41d22c..0fb39bbf66 100644 --- a/engines/pink/objects/actions/action_sound.h +++ b/engines/pink/objects/actions/action_sound.h @@ -23,7 +23,7 @@ #ifndef PINK_ACTION_SOUND_H #define PINK_ACTION_SOUND_H -#include "action.h" +#include "pink/objects/actions/action.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_still.cpp b/engines/pink/objects/actions/action_still.cpp index f1c26cdd4a..acc0a2e30d 100644 --- a/engines/pink/objects/actions/action_still.cpp +++ b/engines/pink/objects/actions/action_still.cpp @@ -20,11 +20,12 @@ * */ -#include <common/debug.h> -#include "action_still.h" -#include "engines/pink/archive.h" -#include <engines/pink/objects/actors/actor.h> +#include "common/debug.h" + +#include "pink/archive.h" #include "pink/cel_decoder.h" +#include "pink/objects/actions/action_still.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_still.h b/engines/pink/objects/actions/action_still.h index 7568c9ba3d..cef3967e33 100644 --- a/engines/pink/objects/actions/action_still.h +++ b/engines/pink/objects/actions/action_still.h @@ -23,7 +23,7 @@ #ifndef PINK_ACTION_STILL_H #define PINK_ACTION_STILL_H -#include "action_cel.h" +#include "pink/objects/actions/action_cel.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_talk.cpp b/engines/pink/objects/actions/action_talk.cpp index 09dc97218d..644e14374c 100644 --- a/engines/pink/objects/actions/action_talk.cpp +++ b/engines/pink/objects/actions/action_talk.cpp @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * */ - -#include "action_talk.h" -#include <pink/archive.h> -#include <pink/objects/actors/actor.h> -#include <pink/objects/pages/game_page.h> -#include <pink/cel_decoder.h> -#include <pink/sound.h> + +#include "pink/archive.h" +#include "pink/cel_decoder.h" +#include "pink/sound.h" +#include "pink/objects/actions/action_talk.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_talk.h b/engines/pink/objects/actions/action_talk.h index bbe16eb496..77e8d9099d 100644 --- a/engines/pink/objects/actions/action_talk.h +++ b/engines/pink/objects/actions/action_talk.h @@ -23,7 +23,7 @@ #ifndef PINK_ACTION_TALK_H #define PINK_ACTION_TALK_H -#include <engines/pink/objects/actions/action_loop.h> +#include "pink/objects/actions/action_loop.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp index eaf161117e..034aa1da1e 100644 --- a/engines/pink/objects/actions/action_text.cpp +++ b/engines/pink/objects/actions/action_text.cpp @@ -20,9 +20,10 @@ * */ -#include "action_text.h" -#include <pink/archive.h> -#include <common/debug.h> +#include "common/debug.h" + +#include "pink/archive.h" +#include "pink/objects/actions/action_text.h" namespace Pink { diff --git a/engines/pink/objects/actions/action_text.h b/engines/pink/objects/actions/action_text.h index e988254cf7..22159490ce 100644 --- a/engines/pink/objects/actions/action_text.h +++ b/engines/pink/objects/actions/action_text.h @@ -23,7 +23,7 @@ #ifndef PINK_ACTION_TEXT_H #define PINK_ACTION_TEXT_H -#include "action.h" +#include "pink/objects/actions/action.h" namespace Pink { diff --git a/engines/pink/objects/actions/walk_action.cpp b/engines/pink/objects/actions/walk_action.cpp index 9c5dac561f..42ce90e76c 100644 --- a/engines/pink/objects/actions/walk_action.cpp +++ b/engines/pink/objects/actions/walk_action.cpp @@ -20,9 +20,9 @@ * */ -#include "walk_action.h" -#include <engines/pink/archive.h> +#include "pink/archive.h" #include "pink/cel_decoder.h" +#include "pink/objects/actions/walk_action.h" namespace Pink { diff --git a/engines/pink/objects/actions/walk_action.h b/engines/pink/objects/actions/walk_action.h index f74adb8264..21926ab9c1 100644 --- a/engines/pink/objects/actions/walk_action.h +++ b/engines/pink/objects/actions/walk_action.h @@ -23,7 +23,7 @@ #ifndef PINK_WALK_ACTION_H #define PINK_WALK_ACTION_H -#include "action_cel.h" +#include "pink/objects/actions/action_cel.h" namespace Pink { diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp index 776a403038..3bfd1eb184 100644 --- a/engines/pink/objects/actors/actor.cpp +++ b/engines/pink/objects/actors/actor.cpp @@ -20,12 +20,12 @@ * */ -#include <engines/pink/constants.h> -#include "actor.h" -#include "engines/pink/objects/pages/game_page.h" -#include "lead_actor.h" -#include "engines/pink/objects/actions/action.h" +#include "pink/constants.h" #include "pink/cursor_mgr.h" +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h index 2c56e81325..4992a75194 100644 --- a/engines/pink/objects/actors/actor.h +++ b/engines/pink/objects/actors/actor.h @@ -23,9 +23,10 @@ #ifndef PINK_ACTOR_H #define PINK_ACTOR_H -#include <common/array.h> -#include <common/rect.h> -#include "engines/pink/objects/object.h" +#include "common/array.h" +#include "common/rect.h" + +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/actors/audio_info_pda_button.h b/engines/pink/objects/actors/audio_info_pda_button.h index f869596436..f27f70acc4 100644 --- a/engines/pink/objects/actors/audio_info_pda_button.h +++ b/engines/pink/objects/actors/audio_info_pda_button.h @@ -23,11 +23,12 @@ #ifndef PINK_AUDIO_INFO_PDA_BUTTON_H #define PINK_AUDIO_INFO_PDA_BUTTON_H -#include <common/debug.h> -#include <pink/objects/actions/action.h> -#include <engines/pink/constants.h> -#include <engines/pink/cursor_mgr.h> -#include "actor.h" +#include "common/debug.h" + +#include "pink/constants.h" +#include "pink/cursor_mgr.h" +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actors/cursor_actor.h b/engines/pink/objects/actors/cursor_actor.h index 32e433ff27..8e0005a183 100644 --- a/engines/pink/objects/actors/cursor_actor.h +++ b/engines/pink/objects/actors/cursor_actor.h @@ -23,9 +23,10 @@ #ifndef PINK_CURSOR_ACTOR_H #define PINK_CURSOR_ACTOR_H -#include <common/debug.h> -#include <pink/objects/actions/action.h> -#include "actor.h" +#include "common/debug.h" + +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actors/inventory_actor.h b/engines/pink/objects/actors/inventory_actor.h index 55dd83b902..3f9c1ec21e 100644 --- a/engines/pink/objects/actors/inventory_actor.h +++ b/engines/pink/objects/actors/inventory_actor.h @@ -23,9 +23,10 @@ #ifndef PINK_INVENTORY_ACTOR_H #define PINK_INVENTORY_ACTOR_H -#include <pink/objects/actions/action.h> -#include <common/debug.h> -#include "actor.h" +#include "common/debug.h" + +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actors/lead_actor.cpp b/engines/pink/objects/actors/lead_actor.cpp index cb87a24107..5de351bc03 100644 --- a/engines/pink/objects/actors/lead_actor.cpp +++ b/engines/pink/objects/actors/lead_actor.cpp @@ -20,16 +20,16 @@ * */ -#include "lead_actor.h" -#include <engines/pink/objects/actions/action.h> -#include <engines/pink/objects/sequences/sequence_context.h> -#include "engines/pink/objects/walk/walk_mgr.h" -#include "engines/pink/cursor_mgr.h" -#include "engines/pink/objects/sequences/sequencer.h" -#include "engines/pink/archive.h" -#include "engines/pink/objects/pages/game_page.h" -#include "engines/pink/pink.h" -#include "supporting_actor.h" +#include "pink/archive.h" +#include "pink/cursor_mgr.h" +#include "pink/pink.h" +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/supporting_actor.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequence_context.h" +#include "pink/objects/sequences/sequencer.h" +#include "pink/objects/walk/walk_mgr.h" namespace Pink { diff --git a/engines/pink/objects/actors/lead_actor.h b/engines/pink/objects/actors/lead_actor.h index 977096bf82..b6f91acabf 100644 --- a/engines/pink/objects/actors/lead_actor.h +++ b/engines/pink/objects/actors/lead_actor.h @@ -23,10 +23,10 @@ #ifndef PINK_LEAD_ACTOR_H #define PINK_LEAD_ACTOR_H -#include <common/keyboard.h> -#include <common/rect.h> -#include "actor.h" +#include "common/rect.h" +#include "common/keyboard.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actors/pda_button_actor.cpp b/engines/pink/objects/actors/pda_button_actor.cpp index 8ccaf6063a..18e29a617c 100644 --- a/engines/pink/objects/actors/pda_button_actor.cpp +++ b/engines/pink/objects/actors/pda_button_actor.cpp @@ -20,8 +20,8 @@ * */ -#include "pda_button_actor.h" #include "pink/archive.h" +#include "pink/objects/actors/pda_button_actor.h" namespace Pink { diff --git a/engines/pink/objects/actors/pda_button_actor.h b/engines/pink/objects/actors/pda_button_actor.h index f1e244f3a7..b3a6d20e63 100644 --- a/engines/pink/objects/actors/pda_button_actor.h +++ b/engines/pink/objects/actors/pda_button_actor.h @@ -23,7 +23,7 @@ #ifndef PINK_PDA_BUTTON_ACTOR_H #define PINK_PDA_BUTTON_ACTOR_H -#include "actor.h" +#include "pink/objects/actors/actor.h" namespace Pink { diff --git a/engines/pink/objects/actors/supporting_actor.cpp b/engines/pink/objects/actors/supporting_actor.cpp index 9d6b2d724a..5fd575d57f 100644 --- a/engines/pink/objects/actors/supporting_actor.cpp +++ b/engines/pink/objects/actors/supporting_actor.cpp @@ -20,12 +20,12 @@ * */ -#include "supporting_actor.h" -#include <engines/pink/archive.h> -#include <engines/pink/objects/actions/action.h> -#include <engines/pink/constants.h> +#include "pink/archive.h" +#include "pink/constants.h" #include "pink/cursor_mgr.h" -#include "../inventory.h" +#include "pink/objects/inventory.h" +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/supporting_actor.h" namespace Pink { diff --git a/engines/pink/objects/actors/supporting_actor.h b/engines/pink/objects/actors/supporting_actor.h index 4c8b6cf40b..eecee3a642 100644 --- a/engines/pink/objects/actors/supporting_actor.h +++ b/engines/pink/objects/actors/supporting_actor.h @@ -23,8 +23,8 @@ #ifndef PINK_SUPPORTING_ACTOR_H #define PINK_SUPPORTING_ACTOR_H -#include <engines/pink/objects/handlers/handler_mgr.h> -#include "actor.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/handlers/handler_mgr.h" namespace Pink { diff --git a/engines/pink/objects/condition.cpp b/engines/pink/objects/condition.cpp index ec9675b6e9..3de8605060 100644 --- a/engines/pink/objects/condition.cpp +++ b/engines/pink/objects/condition.cpp @@ -20,11 +20,11 @@ * */ -#include <engines/pink/archive.h> -#include <engines/pink/objects/actors/lead_actor.h> -#include <engines/pink/objects/pages/game_page.h> -#include <engines/pink/pink.h> -#include "condition.h" +#include "pink/archive.h" +#include "pink/pink.h" +#include "pink/objects/condition.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/condition.h b/engines/pink/objects/condition.h index e9c9fd43e5..4b48d83e7d 100644 --- a/engines/pink/objects/condition.h +++ b/engines/pink/objects/condition.h @@ -23,7 +23,7 @@ #ifndef PINK_CONDITION_H #define PINK_CONDITION_H -#include <engines/pink/objects/object.h> +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/handlers/handler.cpp b/engines/pink/objects/handlers/handler.cpp index dd24925743..cd55d5a3be 100644 --- a/engines/pink/objects/handlers/handler.cpp +++ b/engines/pink/objects/handlers/handler.cpp @@ -20,15 +20,15 @@ * */ -#include "handler.h" -#include "engines/pink/archive.h" -#include "engines/pink/objects/side_effect.h" -#include <engines/pink/objects/condition.h> -#include <engines/pink/objects/sequences/sequencer.h> -#include <engines/pink/objects/sequences/sequence.h> -#include <engines/pink/objects/actors/lead_actor.h> -#include <engines/pink/objects/pages/game_page.h> -#include <engines/pink/pink.h> +#include "pink/archive.h" +#include "pink/pink.h" +#include "pink/objects/side_effect.h" +#include "pink/objects/condition.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/handlers/handler.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequencer.h" +#include "pink/objects/sequences/sequence.h" namespace Pink { diff --git a/engines/pink/objects/handlers/handler.h b/engines/pink/objects/handlers/handler.h index bf1f26b50c..769a4c3c6a 100644 --- a/engines/pink/objects/handlers/handler.h +++ b/engines/pink/objects/handlers/handler.h @@ -23,10 +23,9 @@ #ifndef PINK_HANDLER_H #define PINK_HANDLER_H -#include <common/array.h> -#include <common/str-array.h> -#include <engines/pink/objects/object.h> +#include "common/str-array.h" +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/handlers/handler_mgr.cpp b/engines/pink/objects/handlers/handler_mgr.cpp index caa5582814..f11c7280d5 100644 --- a/engines/pink/objects/handlers/handler_mgr.cpp +++ b/engines/pink/objects/handlers/handler_mgr.cpp @@ -20,10 +20,10 @@ * */ -#include "handler_mgr.h" -#include "handler.h" -#include <pink/archive.h> -#include <pink/objects/inventory.h> +#include "pink/archive.h" +#include "pink/objects/inventory.h" +#include "pink/objects/handlers/handler.h" +#include "pink/objects/handlers/handler_mgr.h" namespace Pink { diff --git a/engines/pink/objects/handlers/handler_mgr.h b/engines/pink/objects/handlers/handler_mgr.h index 48de7033da..f9a073916d 100644 --- a/engines/pink/objects/handlers/handler_mgr.h +++ b/engines/pink/objects/handlers/handler_mgr.h @@ -23,8 +23,9 @@ #ifndef PINK_HANDLER_MGR_H #define PINK_HANDLER_MGR_H -#include <engines/pink/objects/object.h> -#include <common/array.h> +#include "common/array.h" + +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/handlers/handler_timer.cpp b/engines/pink/objects/handlers/handler_timer.cpp index b0bfb90918..18818ab964 100644 --- a/engines/pink/objects/handlers/handler_timer.cpp +++ b/engines/pink/objects/handlers/handler_timer.cpp @@ -20,18 +20,17 @@ * */ - -#include "handler_timer.h" -#include <common/debug.h> -#include <engines/pink/archive.h> -#include <engines/pink/objects/sequences/sequence.h> -#include <engines/pink/objects/side_effect.h> -#include <engines/pink/objects/condition.h> -#include <engines/pink/objects/actors/lead_actor.h> -#include <engines/pink/objects/pages/game_page.h> -#include <engines/pink/objects/sequences/sequencer.h> -#include <engines/pink/pink.h> - +#include "common/debug.h" + +#include "pink/archive.h" +#include "pink/pink.h" +#include "pink/objects/side_effect.h" +#include "pink/objects/condition.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/handlers/handler_timer.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequence.h" +#include "pink/objects/sequences/sequencer.h" namespace Pink { diff --git a/engines/pink/objects/handlers/handler_timer.h b/engines/pink/objects/handlers/handler_timer.h index 3f5458296f..737804f4ff 100644 --- a/engines/pink/objects/handlers/handler_timer.h +++ b/engines/pink/objects/handlers/handler_timer.h @@ -23,8 +23,9 @@ #ifndef PINK_HANDLER_TIMER_H #define PINK_HANDLER_TIMER_H -#include <common/str-array.h> -#include "handler.h" +#include "common/str-array.h" + +#include "pink/objects/handlers/handler.h" namespace Pink { diff --git a/engines/pink/objects/inventory.cpp b/engines/pink/objects/inventory.cpp index 6d13f8a711..66dbd400c0 100644 --- a/engines/pink/objects/inventory.cpp +++ b/engines/pink/objects/inventory.cpp @@ -21,14 +21,15 @@ */ -#include <common/debug.h> -#include "inventory.h" -#include "engines/pink/archive.h" -#include "pink/objects/actors/lead_actor.h" -#include "pink/objects/actions/action.h" -#include "pink/objects/pages/game_page.h" +#include "common/debug.h" + +#include "pink/archive.h" #include "pink/director.h" #include "pink/pink.h" +#include "pink/objects/inventory.h" +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/inventory.h b/engines/pink/objects/inventory.h index d5953ebbba..8cb4f0aba9 100644 --- a/engines/pink/objects/inventory.h +++ b/engines/pink/objects/inventory.h @@ -23,10 +23,10 @@ #ifndef PINK_INVENTORY_H #define PINK_INVENTORY_H +#include "common/array.h" +#include "common/rect.h" -#include <common/array.h> -#include <common/rect.h> -#include "engines/pink/objects/object.h" +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp index 46ea8e11e4..0d607783e9 100644 --- a/engines/pink/objects/module.cpp +++ b/engines/pink/objects/module.cpp @@ -20,9 +20,9 @@ * */ -#include "module.h" -#include "engines/pink/objects/pages/game_page.h" #include "pink/pink.h" +#include "pink/objects/module.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/objects/module.h b/engines/pink/objects/module.h index 2824191dcd..c19571bd1c 100644 --- a/engines/pink/objects/module.h +++ b/engines/pink/objects/module.h @@ -23,11 +23,12 @@ #ifndef PINK_MODULE_H #define PINK_MODULE_H -#include "engines/pink/archive.h" -#include "engines/pink/objects/object.h" -#include <common/debug.h> -#include <common/hash-str.h> -#include "engines/pink/objects/inventory.h" +#include "common/debug.h" +#include "common/hash-str.h" + +#include "pink/archive.h" +#include "pink/objects/object.h" +#include "pink/objects/inventory.h" namespace Pink { diff --git a/engines/pink/objects/object.cpp b/engines/pink/objects/object.cpp index eac48bdfe6..d123aaf473 100644 --- a/engines/pink/objects/object.cpp +++ b/engines/pink/objects/object.cpp @@ -20,9 +20,10 @@ * */ -#include <common/debug.h> -#include "object.h" -#include "engines/pink/archive.h" +#include "common/debug.h" + +#include "pink/archive.h" +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/object.h b/engines/pink/objects/object.h index 1f67c3dac7..f2301df98a 100644 --- a/engines/pink/objects/object.h +++ b/engines/pink/objects/object.h @@ -23,7 +23,7 @@ #ifndef PINK_OBJECT_H #define PINK_OBJECT_H -#include <common/str.h> +#include "common/str.h" namespace Pink { diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp index 63a2607ee4..2ac88fbfdf 100644 --- a/engines/pink/objects/pages/game_page.cpp +++ b/engines/pink/objects/pages/game_page.cpp @@ -20,13 +20,13 @@ * */ -#include <engines/pink/objects/handlers/handler.h> -#include "game_page.h" -#include <engines/pink/objects/walk/walk_mgr.h> -#include "engines/pink/cursor_mgr.h" -#include "engines/pink/objects/actors/lead_actor.h" -#include "engines/pink/objects/sequences/sequencer.h" +#include "pink/cursor_mgr.h" #include "pink/pink.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/handlers/handler.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequencer.h" +#include "pink/objects/walk/walk_mgr.h" namespace Pink { diff --git a/engines/pink/objects/pages/game_page.h b/engines/pink/objects/pages/game_page.h index 469d1b3a1e..9aa5422981 100644 --- a/engines/pink/objects/pages/game_page.h +++ b/engines/pink/objects/pages/game_page.h @@ -23,8 +23,9 @@ #ifndef PINK_GAME_PAGE_H #define PINK_GAME_PAGE_H -#include <common/memstream.h> -#include "page.h" +#include "common/memstream.h" + +#include "pink/objects/pages/page.h" namespace Pink { diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp index 33ccf15357..f2b8bb4a93 100644 --- a/engines/pink/objects/pages/page.cpp +++ b/engines/pink/objects/pages/page.cpp @@ -20,10 +20,9 @@ * */ -#include "page.h" -#include "engines/pink/objects/actors/lead_actor.h" -#include "engines/pink/director.h" - +#include "pink/director.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/pages/page.h" namespace Pink { diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h index 23b060c143..c6d82209c5 100644 --- a/engines/pink/objects/pages/page.h +++ b/engines/pink/objects/pages/page.h @@ -23,10 +23,8 @@ #ifndef PINK_PAGE_H #define PINK_PAGE_H -#include <video/flic_decoder.h> -#include "engines/pink/objects/object.h" -#include "engines/pink/objects/module.h" -#include "engines/pink/resource_mgr.h" +#include "pink/resource_mgr.h" +#include "pink/objects/module.h" namespace Pink { diff --git a/engines/pink/objects/sequences/seq_timer.cpp b/engines/pink/objects/sequences/seq_timer.cpp index 26c8afa93a..c8d166a0cd 100644 --- a/engines/pink/objects/sequences/seq_timer.cpp +++ b/engines/pink/objects/sequences/seq_timer.cpp @@ -20,13 +20,14 @@ * */ -#include "seq_timer.h" -#include <engines/pink/archive.h> -#include "./sequencer.h" -#include <common/debug.h> -#include <engines/pink/objects/actors/supporting_actor.h> -#include "pink/objects/pages/game_page.h" +#include "common/debug.h" + +#include "pink/archive.h" #include "pink/pink.h" +#include "pink/objects/actors/supporting_actor.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/seq_timer.h" +#include "pink/objects/sequences/sequencer.h" namespace Pink { diff --git a/engines/pink/objects/sequences/seq_timer.h b/engines/pink/objects/sequences/seq_timer.h index 5970d2ab4c..bfd6295ce0 100644 --- a/engines/pink/objects/sequences/seq_timer.h +++ b/engines/pink/objects/sequences/seq_timer.h @@ -23,7 +23,7 @@ #ifndef PINK_SEQ_TIMER_H #define PINK_SEQ_TIMER_H -#include <engines/pink/objects/object.h> +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequence.cpp b/engines/pink/objects/sequences/sequence.cpp index 577b310007..c41d225510 100644 --- a/engines/pink/objects/sequences/sequence.cpp +++ b/engines/pink/objects/sequences/sequence.cpp @@ -20,15 +20,16 @@ * */ -#include <common/debug.h> -#include "sequence_item.h" -#include "sequence.h" -#include "sequencer.h" -#include "engines/pink/archive.h" -#include "engines/pink/objects/pages/game_page.h" -#include "engines/pink/objects/actors/actor.h" -#include "sequence_context.h" +#include "common/debug.h" + +#include "pink/archive.h" #include "pink/sound.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequence.h" +#include "pink/objects/sequences/sequence_context.h" +#include "pink/objects/sequences/sequence_item.h" +#include "pink/objects/sequences/sequencer.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequence.h b/engines/pink/objects/sequences/sequence.h index 5db00b4920..2cbdff42ba 100644 --- a/engines/pink/objects/sequences/sequence.h +++ b/engines/pink/objects/sequences/sequence.h @@ -23,8 +23,9 @@ #ifndef PINK_SEQUENCE_H #define PINK_SEQUENCE_H -#include <engines/pink/objects/object.h> -#include <common/array.h> +#include "common/array.h" + +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequence_context.cpp b/engines/pink/objects/sequences/sequence_context.cpp index 675e567253..01b76a8770 100644 --- a/engines/pink/objects/sequences/sequence_context.cpp +++ b/engines/pink/objects/sequences/sequence_context.cpp @@ -20,13 +20,14 @@ * */ -#include <common/debug.h> -#include "sequence_context.h" -#include "sequence.h" -#include "sequence_item.h" -#include "sequencer.h" -#include "engines/pink/objects/pages/game_page.h" -#include "engines/pink/objects/actors/actor.h" +#include "common/debug.h" + +#include "pink/objects/actors/actor.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequence.h" +#include "pink/objects/sequences/sequence_context.h" +#include "pink/objects/sequences/sequence_item.h" +#include "pink/objects/sequences/sequencer.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequence_context.h b/engines/pink/objects/sequences/sequence_context.h index f35f5e4799..11b43bb491 100644 --- a/engines/pink/objects/sequences/sequence_context.h +++ b/engines/pink/objects/sequences/sequence_context.h @@ -23,7 +23,7 @@ #ifndef PINK_SEQUENCE_CONTEXT_H #define PINK_SEQUENCE_CONTEXT_H -#include <common/array.h> +#include "common/array.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequence_item.cpp b/engines/pink/objects/sequences/sequence_item.cpp index dfc4613daa..a6574b15de 100644 --- a/engines/pink/objects/sequences/sequence_item.cpp +++ b/engines/pink/objects/sequences/sequence_item.cpp @@ -20,15 +20,16 @@ * */ -#include "sequence_item.h" -#include <common/debug.h> -#include <engines/pink/objects/sequences/sequence.h> -#include <engines/pink/objects/sequences/sequencer.h> -#include <engines/pink/objects/actions/action.h> -#include "engines/pink/archive.h" -#include "engines/pink/objects/pages/game_page.h" -#include "engines/pink/objects/actors/actor.h" -#include "sequence_context.h" +#include "common/debug.h" + +#include "pink/archive.h" +#include "pink/objects/actions/action.h" +#include "pink/objects/actors/actor.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequence_item.h" +#include "pink/objects/sequences/sequence.h" +#include "pink/objects/sequences/sequencer.h" +#include "pink/objects/sequences/sequence_context.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequence_item.h b/engines/pink/objects/sequences/sequence_item.h index 0563310fea..dd026a87d9 100644 --- a/engines/pink/objects/sequences/sequence_item.h +++ b/engines/pink/objects/sequences/sequence_item.h @@ -23,7 +23,7 @@ #ifndef PINK_SEQUENCE_ITEM_H #define PINK_SEQUENCE_ITEM_H -#include <engines/pink/objects/object.h> +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp index e0a1f5fea0..349f7ad840 100644 --- a/engines/pink/objects/sequences/sequencer.cpp +++ b/engines/pink/objects/sequences/sequencer.cpp @@ -20,15 +20,15 @@ * */ +#include "common/debug.h" -#include <common/debug.h> -#include "sequencer.h" -#include "sequence.h" -#include "sequence_context.h" +#include "pink/archive.h" +#include "pink/pink.h" #include "pink/objects/actors/actor.h" -#include "engines/pink/archive.h" #include "pink/objects/pages/game_page.h" -#include "pink/pink.h" +#include "pink/objects/sequences/sequencer.h" +#include "pink/objects/sequences/sequence.h" +#include "pink/objects/sequences/sequence_context.h" #include "pink/objects/sequences/seq_timer.h" namespace Pink { diff --git a/engines/pink/objects/sequences/sequencer.h b/engines/pink/objects/sequences/sequencer.h index 6ae5550a1a..850649d23e 100644 --- a/engines/pink/objects/sequences/sequencer.h +++ b/engines/pink/objects/sequences/sequencer.h @@ -20,12 +20,12 @@ * */ - #ifndef PINK_SEQUENCER_H #define PINK_SEQUENCER_H -#include <common/array.h> -#include "engines/pink/objects/object.h" +#include "common/array.h" + +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/side_effect.cpp b/engines/pink/objects/side_effect.cpp index 7cdb2c9183..ec0f24e9d2 100644 --- a/engines/pink/objects/side_effect.cpp +++ b/engines/pink/objects/side_effect.cpp @@ -20,15 +20,15 @@ * */ -#include <common/hash-str.h> -#include "side_effect.h" -#include <engines/pink/archive.h> -#include <engines/pink/objects/actors/lead_actor.h> -#include <engines/pink/objects/pages/game_page.h> -#include <engines/pink/pink.h> -#include <engines/pink/objects/walk/walk_location.h> -#include <engines/pink/objects/walk/walk_mgr.h> - +#include "common/hash-str.h" + +#include "pink/archive.h" +#include "pink/pink.h" +#include "pink/objects/side_effect.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/pages/game_page.h" +#include "pink/objects/walk/walk_location.h" +#include "pink/objects/walk/walk_mgr.h" namespace Pink { diff --git a/engines/pink/objects/side_effect.h b/engines/pink/objects/side_effect.h index b184eb68bf..da6d548753 100644 --- a/engines/pink/objects/side_effect.h +++ b/engines/pink/objects/side_effect.h @@ -23,8 +23,9 @@ #ifndef PINK_SIDE_EFFECT_H #define PINK_SIDE_EFFECT_H -#include <engines/pink/objects/object.h> -#include <common/str-array.h> +#include "common/str-array.h" + +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/walk/walk_location.cpp b/engines/pink/objects/walk/walk_location.cpp index c4b56d95db..9ef6a7ff28 100644 --- a/engines/pink/objects/walk/walk_location.cpp +++ b/engines/pink/objects/walk/walk_location.cpp @@ -20,9 +20,10 @@ * */ -#include <common/debug.h> -#include "walk_location.h" -#include "engines/pink/archive.h" +#include "common/debug.h" + +#include "pink/archive.h" +#include "pink/objects/walk/walk_location.h" namespace Pink { diff --git a/engines/pink/objects/walk/walk_location.h b/engines/pink/objects/walk/walk_location.h index 19674a1592..3de039002d 100644 --- a/engines/pink/objects/walk/walk_location.h +++ b/engines/pink/objects/walk/walk_location.h @@ -22,10 +22,9 @@ #ifndef PINK_WALK_LOCATION_H #define PINK_WALK_LOCATION_H -#include <engines/pink/objects/object.h> -#include <common/array.h> -#include <common/str-array.h> +#include "common/str-array.h" +#include "pink/objects/object.h" namespace Pink { diff --git a/engines/pink/objects/walk/walk_mgr.cpp b/engines/pink/objects/walk/walk_mgr.cpp index b87429d616..ed6cb39a1b 100644 --- a/engines/pink/objects/walk/walk_mgr.cpp +++ b/engines/pink/objects/walk/walk_mgr.cpp @@ -20,12 +20,12 @@ * */ -#include "walk_mgr.h" -#include "walk_location.h" -#include "engines/pink/objects/actions/walk_action.h" -#include "engines/pink/objects/actors/lead_actor.h" -#include "engines/pink/archive.h" +#include "pink/archive.h" #include "pink/cel_decoder.h" +#include "pink/objects/actions/walk_action.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/walk/walk_mgr.h" +#include "pink/objects/walk/walk_location.h" namespace Pink { diff --git a/engines/pink/objects/walk/walk_mgr.h b/engines/pink/objects/walk/walk_mgr.h index 403cc7ee2e..522dcf884c 100644 --- a/engines/pink/objects/walk/walk_mgr.h +++ b/engines/pink/objects/walk/walk_mgr.h @@ -23,9 +23,10 @@ #ifndef PINK_WALK_MGR_H #define PINK_WALK_MGR_H -#include <common/array.h> -#include "engines/pink/objects/object.h" -#include "walk_shortest_path.h" +#include "common/array.h" + +#include "pink/objects/object.h" +#include "pink/objects/walk/walk_shortest_path.h" namespace Pink { diff --git a/engines/pink/objects/walk/walk_shortest_path.cpp b/engines/pink/objects/walk/walk_shortest_path.cpp index 4c6f84a154..2148d4c0a8 100644 --- a/engines/pink/objects/walk/walk_shortest_path.cpp +++ b/engines/pink/objects/walk/walk_shortest_path.cpp @@ -20,9 +20,9 @@ * */ -#include "walk_shortest_path.h" -#include "walk_mgr.h" -#include "walk_location.h" +#include "pink/objects/walk/walk_location.h" +#include "pink/objects/walk/walk_mgr.h" +#include "pink/objects/walk/walk_shortest_path.h" namespace Pink { diff --git a/engines/pink/objects/walk/walk_shortest_path.h b/engines/pink/objects/walk/walk_shortest_path.h index 8b7dc803b4..3b9734f35d 100644 --- a/engines/pink/objects/walk/walk_shortest_path.h +++ b/engines/pink/objects/walk/walk_shortest_path.h @@ -23,7 +23,7 @@ #ifndef PINK_WALK_SHORTEST_PATH_H #define PINK_WALK_SHORTEST_PATH_H -#include <common/array.h> +#include "common/array.h" namespace Pink { diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp index 81c1c48c00..56166b0ab4 100644 --- a/engines/pink/pink.cpp +++ b/engines/pink/pink.cpp @@ -20,18 +20,20 @@ * */ -#include "pink.h" -#include "console.h" -#include <engines/util.h> -#include <common/debug-channels.h> -#include <video/flic_decoder.h> -#include "engines/pink/objects/module.h" -#include "engines/pink/objects/actors/lead_actor.h" -#include <graphics/surface.h> -#include <graphics/cursorman.h> -#include <common/winexe_pe.h> -#include <common/config-manager.h> +#include "common/debug-channels.h" +#include "common/winexe_pe.h" +#include "common/config-manager.h" +#include "engines/util.h" + +#include "graphics/cursorman.h" + +#include "pink/pink.h" +#include "pink/console.h" +#include "pink/objects/side_effect.h" +#include "pink/objects/module.h" +#include "pink/objects/actors/lead_actor.h" +#include "pink/objects/sequences/sequencer.h" namespace Pink { diff --git a/engines/pink/pink.h b/engines/pink/pink.h index 17d266fb3a..634adcd430 100644 --- a/engines/pink/pink.h +++ b/engines/pink/pink.h @@ -23,14 +23,18 @@ #ifndef PINK_PINK_H #define PINK_PINK_H -#include <graphics/wincursor.h> #include "common/random.h" + #include "engines/engine.h" + +#include "graphics/wincursor.h" + #include "gui/EventRecorder.h" #include "gui/debugger.h" -#include "file.h" -#include "director.h" -#include "constants.h" + +#include "pink/constants.h" +#include "pink/director.h" +#include "pink/file.h" /* * This is the namespace of the Pink engine. diff --git a/engines/pink/resource_mgr.cpp b/engines/pink/resource_mgr.cpp index b3c963613c..bbf7e7e04a 100644 --- a/engines/pink/resource_mgr.cpp +++ b/engines/pink/resource_mgr.cpp @@ -20,15 +20,14 @@ * */ -#include <video/flic_decoder.h> -#include <common/substream.h> -#include <graphics/surface.h> -#include "resource_mgr.h" -#include "file.h" -#include "pink.h" -#include "sound.h" -#include "engines/pink/objects/pages/game_page.h" -#include "cel_decoder.h" +#include "common/substream.h" + +#include "pink/cel_decoder.h" +#include "pink/file.h" +#include "pink/pink.h" +#include "pink/resource_mgr.h" +#include "pink/sound.h" +#include "pink/objects/pages/game_page.h" namespace Pink { diff --git a/engines/pink/resource_mgr.h b/engines/pink/resource_mgr.h index ff451aa832..4cef65198d 100644 --- a/engines/pink/resource_mgr.h +++ b/engines/pink/resource_mgr.h @@ -20,13 +20,11 @@ * */ -#include <common/scummsys.h> -#include <common/substream.h> - #ifndef PINK_RESOURCE_MGR_H #define PINK_RESOURCE_MGR_H namespace Common { + class SafeSeekableSubReadStream; class String; } diff --git a/engines/pink/sound.cpp b/engines/pink/sound.cpp index 7077d16fd8..6fbd5fc0c0 100644 --- a/engines/pink/sound.cpp +++ b/engines/pink/sound.cpp @@ -20,12 +20,13 @@ * */ -#include <audio/audiostream.h> -#include <audio/decoders/wave.h> -#include <audio/decoders/adpcm.h> -#include <common/substream.h> -#include "sound.h" -#include "constants.h" +#include "audio/audiostream.h" +#include "audio/decoders/wave.h" + +#include "common/substream.h" + +#include "pink/constants.h" +#include "pink/sound.h" namespace Pink { diff --git a/engines/pink/sound.h b/engines/pink/sound.h index e1074d2af8..f6207f49e9 100644 --- a/engines/pink/sound.h +++ b/engines/pink/sound.h @@ -23,9 +23,10 @@ #ifndef PINK_SOUND_H #define PINK_SOUND_H -#include <common/stream.h> -#include <audio/mixer.h> -#include <common/substream.h> +#include "audio/mixer.h" + +#include "common/stream.h" +#include "common/substream.h" namespace Pink { |