aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects/sequences
diff options
context:
space:
mode:
authorwhiterandrek2018-05-21 12:30:27 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commit39ed15d2f700575ad68c638808f9cf07dc786ec1 (patch)
treeceea5afdcb69a4d357a6a1d3c773c079d7362c24 /engines/pink/objects/sequences
parent38ff5b1e801fda7fdc3c818469cfda5cb27f9937 (diff)
downloadscummvm-rg350-39ed15d2f700575ad68c638808f9cf07dc786ec1.tar.gz
scummvm-rg350-39ed15d2f700575ad68c638808f9cf07dc786ec1.tar.bz2
scummvm-rg350-39ed15d2f700575ad68c638808f9cf07dc786ec1.zip
PINK: fix includes
Diffstat (limited to 'engines/pink/objects/sequences')
-rw-r--r--engines/pink/objects/sequences/seq_timer.cpp13
-rw-r--r--engines/pink/objects/sequences/seq_timer.h2
-rw-r--r--engines/pink/objects/sequences/sequence.cpp17
-rw-r--r--engines/pink/objects/sequences/sequence.h5
-rw-r--r--engines/pink/objects/sequences/sequence_context.cpp15
-rw-r--r--engines/pink/objects/sequences/sequence_context.h2
-rw-r--r--engines/pink/objects/sequences/sequence_item.cpp19
-rw-r--r--engines/pink/objects/sequences/sequence_item.h2
-rw-r--r--engines/pink/objects/sequences/sequencer.cpp12
-rw-r--r--engines/pink/objects/sequences/sequencer.h6
10 files changed, 49 insertions, 44 deletions
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 {