From 39ed15d2f700575ad68c638808f9cf07dc786ec1 Mon Sep 17 00:00:00 2001 From: whiterandrek Date: Mon, 21 May 2018 12:30:27 +0300 Subject: PINK: fix includes --- engines/pink/objects/sequences/seq_timer.cpp | 13 +++++++------ engines/pink/objects/sequences/seq_timer.h | 2 +- engines/pink/objects/sequences/sequence.cpp | 17 +++++++++-------- engines/pink/objects/sequences/sequence.h | 5 +++-- engines/pink/objects/sequences/sequence_context.cpp | 15 ++++++++------- engines/pink/objects/sequences/sequence_context.h | 2 +- engines/pink/objects/sequences/sequence_item.cpp | 19 ++++++++++--------- engines/pink/objects/sequences/sequence_item.h | 2 +- engines/pink/objects/sequences/sequencer.cpp | 12 ++++++------ engines/pink/objects/sequences/sequencer.h | 6 +++--- 10 files changed, 49 insertions(+), 44 deletions(-) (limited to 'engines/pink/objects/sequences') 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 -#include "./sequencer.h" -#include -#include -#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 +#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 -#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 -#include +#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 -#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 +#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 -#include -#include -#include -#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 +#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 -#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 -#include "engines/pink/objects/object.h" +#include "common/array.h" + +#include "pink/objects/object.h" namespace Pink { -- cgit v1.2.3