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/pages/game_page.cpp | 12 ++++++------ engines/pink/objects/pages/game_page.h | 5 +++-- engines/pink/objects/pages/page.cpp | 7 +++---- engines/pink/objects/pages/page.h | 6 ++---- 4 files changed, 14 insertions(+), 16 deletions(-) (limited to 'engines/pink/objects/pages') 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 -#include "game_page.h" -#include -#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 -#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