diff options
author | whiterandrek | 2018-06-10 10:54:08 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | 58e7d560eefa6e7cd86109f1d4b8227856cc01c8 (patch) | |
tree | 5ab267eb29c96c2cab6f7dcd4030f6aa7de12e83 /engines/pink/objects/pages | |
parent | ccd0ec7ffb87a17dda58a00a2f6440cca2641997 (diff) | |
download | scummvm-rg350-58e7d560eefa6e7cd86109f1d4b8227856cc01c8.tar.gz scummvm-rg350-58e7d560eefa6e7cd86109f1d4b8227856cc01c8.tar.bz2 scummvm-rg350-58e7d560eefa6e7cd86109f1d4b8227856cc01c8.zip |
PINK: inline small functions
Diffstat (limited to 'engines/pink/objects/pages')
-rw-r--r-- | engines/pink/objects/pages/game_page.cpp | 12 | ||||
-rw-r--r-- | engines/pink/objects/pages/game_page.h | 6 | ||||
-rw-r--r-- | engines/pink/objects/pages/page.cpp | 13 | ||||
-rw-r--r-- | engines/pink/objects/pages/page.h | 8 |
4 files changed, 7 insertions, 32 deletions
diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp index 8ab1b0a077..35961164df 100644 --- a/engines/pink/objects/pages/game_page.cpp +++ b/engines/pink/objects/pages/game_page.cpp @@ -116,14 +116,6 @@ void GamePage::loadManagers() { } } -Sequencer *GamePage::getSequencer() { - return _sequencer; -} - -Module *GamePage::getModule() const { - return _module; -} - bool GamePage::checkValueOfVariable(const Common::String &variable, const Common::String &value) { if (!_variables.contains(variable)) return value == kUndefined; @@ -135,10 +127,6 @@ void GamePage::setVariable(Common::String &variable, Common::String &value) { _leadActor->onVariableSet(); } -WalkMgr *GamePage::getWalkMgr() { - return _walkMgr; -} - void GamePage::loadStateFromMem() { Archive archive(static_cast<Common::SeekableReadStream*>(_memFile)); _variables.deserialize(archive); diff --git a/engines/pink/objects/pages/game_page.h b/engines/pink/objects/pages/game_page.h index 3cd537d077..81d4686d1a 100644 --- a/engines/pink/objects/pages/game_page.h +++ b/engines/pink/objects/pages/game_page.h @@ -47,9 +47,9 @@ public: void loadManagers(); void init(bool isLoadingSave); - Sequencer *getSequencer(); - WalkMgr *getWalkMgr(); - Module *getModule() const; + Sequencer *getSequencer() { return _sequencer; } + WalkMgr *getWalkMgr() { return _walkMgr; } + Module *getModule() { return _module; } bool checkValueOfVariable(const Common::String &variable, const Common::String &value); void setVariable(Common::String &variable, Common::String &value); diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp index bb93d17f93..c15d3dbae9 100644 --- a/engines/pink/objects/pages/page.cpp +++ b/engines/pink/objects/pages/page.cpp @@ -47,11 +47,6 @@ Actor *Page::findActor(const Common::String &name) { return nullptr; } - -CelDecoder *Page::loadCel(Common::String &fileName) { - return _resMgr.loadCEL(fileName); -} - void Page::toConsole() { for (uint i = 0; i < _actors.size(); ++i) { _actors[i]->toConsole(); @@ -72,10 +67,6 @@ void Page::initPallete() { } } -LeadActor *Page::getLeadActor() { - return _leadActor; -} - void Page::clear() { for (uint i = 0; i < _actors.size(); ++i) { delete _actors[i]; @@ -90,8 +81,4 @@ void Page::pause(bool paused) { } } -PinkEngine *Page::getGame() { - return _resMgr.getGame(); -} - } // End of namespace Pink diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h index 9ccfe20166..bda4c147fa 100644 --- a/engines/pink/objects/pages/page.h +++ b/engines/pink/objects/pages/page.h @@ -44,19 +44,19 @@ public: void initPallete(); Actor *findActor(const Common::String &name); - LeadActor *getLeadActor(); + LeadActor *getLeadActor() { return _leadActor; } Common::SafeSeekableSubReadStream *getResourceStream(const Common::String &fileName) { return _resMgr.getResourceStream(fileName); } - CelDecoder *loadCel(Common::String &fileName); + CelDecoder *loadCel(Common::String &fileName) { return _resMgr.loadCEL(fileName); } virtual void clear(); void pause(bool paused); - PinkEngine *getGame(); + PinkEngine *getGame() { return _resMgr.getGame(); } virtual Sequencer *getSequencer() { return nullptr; } virtual WalkMgr *getWalkMgr() { return nullptr; } - virtual Module *getModule() const { return nullptr; } + virtual Module *getModule() { return nullptr; } virtual bool checkValueOfVariable(const Common::String &variable, const Common::String &value) { return 0; } virtual void setVariable(Common::String &variable, Common::String &value) {} |