aboutsummaryrefslogtreecommitdiff
path: root/engines/pink/objects/pages
diff options
context:
space:
mode:
authorwhiterandrek2018-04-05 08:15:14 +0300
committerEugene Sandulenko2018-06-28 23:51:32 +0200
commitcad72b1532faa96c68848392766f25a4a58398ab (patch)
tree04d5e0cbda2aadb79fce35a1ddd45f0f0798f60f /engines/pink/objects/pages
parent4b7c75607a5d54d95c383fabf381d82d4ac77b94 (diff)
downloadscummvm-rg350-cad72b1532faa96c68848392766f25a4a58398ab.tar.gz
scummvm-rg350-cad72b1532faa96c68848392766f25a4a58398ab.tar.bz2
scummvm-rg350-cad72b1532faa96c68848392766f25a4a58398ab.zip
PINK: basic walk, left click and seqTimer implementation
Diffstat (limited to 'engines/pink/objects/pages')
-rw-r--r--engines/pink/objects/pages/game_page.cpp2
-rw-r--r--engines/pink/objects/pages/page.cpp4
-rw-r--r--engines/pink/objects/pages/page.h4
3 files changed, 8 insertions, 2 deletions
diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp
index 6a90b4887b..c878180c4a 100644
--- a/engines/pink/objects/pages/game_page.cpp
+++ b/engines/pink/objects/pages/game_page.cpp
@@ -83,7 +83,7 @@ void GamePage::init(bool isLoadingSave) {
bool GamePage::initHandler() {
for (uint i = 0; i < _handlers.size(); ++i) {
if (_handlers[i]->isSuitable(_leadActor)){
- _handlers[i]->onMessage(_leadActor);
+ _handlers[i]->handle(_leadActor);
return true;
}
}
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp
index a579d19d5f..471cf8736b 100644
--- a/engines/pink/objects/pages/page.cpp
+++ b/engines/pink/objects/pages/page.cpp
@@ -71,4 +71,8 @@ Page::~Page() {
}
}
+LeadActor *Page::getLeadActor() {
+ return _leadActor;
+}
+
} // End of namespace Pink
diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h
index 81a49db9f6..7eb1a335f3 100644
--- a/engines/pink/objects/pages/page.h
+++ b/engines/pink/objects/pages/page.h
@@ -39,11 +39,13 @@ public:
~Page();
void load(Archive &archive);
Actor *findActor(Common::String &name);
- Sound* loadSound(Common::String &fileName);
+ Sound *loadSound(Common::String &fileName);
CelDecoder *loadCel(Common::String &fileName);
virtual void toConsole();
+ LeadActor *getLeadActor();
+
protected:
void init();
Common::Array<Actor*> _actors;