diff options
Diffstat (limited to 'engines/pink/objects/actions')
22 files changed, 66 insertions, 66 deletions
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 { |