diff options
author | whiterandrek | 2018-05-22 08:03:37 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | 82974a9ce37aba6240f7c3543947631170f012c2 (patch) | |
tree | 6aeed5f5edfb1c758b2c18b8ac224bde40eaff8c /engines/pink/objects/pages | |
parent | 931d6adbcbbe063857814dc76886e9a967b2a4f3 (diff) | |
download | scummvm-rg350-82974a9ce37aba6240f7c3543947631170f012c2.tar.gz scummvm-rg350-82974a9ce37aba6240f7c3543947631170f012c2.tar.bz2 scummvm-rg350-82974a9ce37aba6240f7c3543947631170f012c2.zip |
PINK: fix indentation
Diffstat (limited to 'engines/pink/objects/pages')
-rw-r--r-- | engines/pink/objects/pages/game_page.cpp | 196 | ||||
-rw-r--r-- | engines/pink/objects/pages/game_page.h | 52 | ||||
-rw-r--r-- | engines/pink/objects/pages/page.cpp | 54 | ||||
-rw-r--r-- | engines/pink/objects/pages/page.h | 28 |
4 files changed, 165 insertions, 165 deletions
diff --git a/engines/pink/objects/pages/game_page.cpp b/engines/pink/objects/pages/game_page.cpp index 952ea42b1f..83df359b80 100644 --- a/engines/pink/objects/pages/game_page.cpp +++ b/engines/pink/objects/pages/game_page.cpp @@ -31,128 +31,128 @@ namespace Pink { GamePage::GamePage() - : _cursorMgr(nullptr), _walkMgr(nullptr), _sequencer(nullptr), - _isLoaded(false), _memFile(nullptr) + : _cursorMgr(nullptr), _walkMgr(nullptr), _sequencer(nullptr), + _isLoaded(false), _memFile(nullptr) {} GamePage::~GamePage() { - clear(); + clear(); } void GamePage::toConsole() { - Page::toConsole(); - _walkMgr->toConsole(); - _sequencer->toConsole(); - for (uint i = 0; i < _handlers.size(); ++i) { - _handlers[i]->toConsole(); - } + Page::toConsole(); + _walkMgr->toConsole(); + _sequencer->toConsole(); + for (uint i = 0; i < _handlers.size(); ++i) { + _handlers[i]->toConsole(); + } } void GamePage::deserialize(Archive &archive) { - Page::deserialize(archive); - _module = static_cast<Module*>(archive.readObject()); - assert(dynamic_cast<Module*>(_module) != 0); + Page::deserialize(archive); + _module = static_cast<Module*>(archive.readObject()); + assert(dynamic_cast<Module*>(_module) != 0); } void GamePage::load(Archive &archive) { - archive.mapObject(_cursorMgr); - archive.mapObject(_walkMgr); - archive.mapObject(_sequencer); + archive.mapObject(_cursorMgr); + archive.mapObject(_walkMgr); + archive.mapObject(_sequencer); - Page::load(archive); + Page::load(archive); - _leadActor = static_cast<LeadActor*>(archive.readObject()); + _leadActor = static_cast<LeadActor*>(archive.readObject()); - _walkMgr->deserialize(archive); - _sequencer->deserialize(archive); - _handlers.deserialize(archive); + _walkMgr->deserialize(archive); + _sequencer->deserialize(archive); + _handlers.deserialize(archive); } void GamePage::init(bool isLoadingSave) { - if (!_isLoaded) - loadManagers(); + if (!_isLoaded) + loadManagers(); - toConsole(); + toConsole(); - for (uint j = 0; j < _actors.size(); ++j) { - if (_actors[j]->initPallete(_module->getGame()->getDirector())) - break; - } + for (uint j = 0; j < _actors.size(); ++j) { + if (_actors[j]->initPallete(_module->getGame()->getDirector())) + break; + } - LeadActor::State state = _leadActor->getState(); - bool startNow = !(state == LeadActor::kInventory || state == LeadActor::kPDA); + LeadActor::State state = _leadActor->getState(); + bool startNow = !(state == LeadActor::kInventory || state == LeadActor::kPDA); - for (uint i = 0; i < _actors.size(); ++i) { - _actors[i]->init(startNow); - } + for (uint i = 0; i < _actors.size(); ++i) { + _actors[i]->init(startNow); + } - bool isHandler = false; - if (!isLoadingSave) { - isHandler = initHandler(); - } + bool isHandler = false; + if (!isLoadingSave) { + isHandler = initHandler(); + } - _leadActor->start(isHandler); + _leadActor->start(isHandler); } bool GamePage::initHandler() { - for (uint i = 0; i < _handlers.size(); ++i) { - if (_handlers[i]->isSuitable(_leadActor)){ - _handlers[i]->handle(_leadActor); - return true; - } - } - return false; + for (uint i = 0; i < _handlers.size(); ++i) { + if (_handlers[i]->isSuitable(_leadActor)){ + _handlers[i]->handle(_leadActor); + return true; + } + } + return false; } void GamePage::loadManagers() { - _isLoaded = true; + _isLoaded = true; - _cursorMgr = new CursorMgr(_module->getGame(), this); - _walkMgr = new WalkMgr; - _sequencer = new Sequencer(this); + _cursorMgr = new CursorMgr(_module->getGame(), this); + _walkMgr = new WalkMgr; + _sequencer = new Sequencer(this); - _resMgr.init(_module->getGame(), this); + _resMgr.init(_module->getGame(), this); - if (_memFile != nullptr) { - loadState(); + if (_memFile != nullptr) { + loadState(); - delete _memFile; - _memFile = nullptr; - } + delete _memFile; + _memFile = nullptr; + } } PinkEngine *GamePage::getGame() { - return _resMgr.getGame(); + return _resMgr.getGame(); } Sequencer *GamePage::getSequencer() { - return _sequencer; + return _sequencer; } Module *GamePage::getModule() const { - return _module; + return _module; } bool GamePage::checkValueOfVariable(const Common::String &variable, const Common::String &value) { - if (!_variables.contains(variable)) - return value == kUndefined; - return _variables[variable] == value; + if (!_variables.contains(variable)) + return value == kUndefined; + return _variables[variable] == value; } void GamePage::setVariable(Common::String &variable, Common::String &value) { - _variables[variable] = value; - _leadActor->onVariableSet(); + _variables[variable] = value; + _leadActor->onVariableSet(); } WalkMgr *GamePage::getWalkMgr() { - return _walkMgr; + return _walkMgr; } void GamePage::loadState() { - Archive archive(static_cast<Common::SeekableReadStream*>(_memFile)); - //_variables.clear(1); - Common::StringMap mapTest; // HACK. Without it isn't working - //archive >> _variables; + Archive archive(static_cast<Common::SeekableReadStream*>(_memFile)); + //_variables.clear(1); + Common::StringMap mapTest; // HACK. Without it isn't working + //archive >> _variables; uint size = archive.readCount(); for (uint i = 0; i < size; ++i) { @@ -161,56 +161,56 @@ void GamePage::loadState() { mapTest.setVal(key, val); } - _variables = mapTest; + _variables = mapTest; - uint16 actorCount = archive.readWORD(); + uint16 actorCount = archive.readWORD(); - Common::String actorName; - for (int i = 0; i < actorCount; ++i) { - actorName = archive.readString(); - findActor(actorName)->loadState(archive); - } + Common::String actorName; + for (int i = 0; i < actorCount; ++i) { + actorName = archive.readString(); + findActor(actorName)->loadState(archive); + } } void GamePage::saveState() { - _memFile = new Common::MemoryReadWriteStream(DisposeAfterUse::YES); - Archive archive(static_cast<Common::WriteStream*>(_memFile)); + _memFile = new Common::MemoryReadWriteStream(DisposeAfterUse::YES); + Archive archive(static_cast<Common::WriteStream*>(_memFile)); - for (Common::StringMap::const_iterator it = _variables.begin(); it != _variables.end(); ++it) { - archive.writeString(it->_key); - archive.writeString(it->_value); - } + for (Common::StringMap::const_iterator it = _variables.begin(); it != _variables.end(); ++it) { + archive.writeString(it->_key); + archive.writeString(it->_value); + } - archive.writeWORD(_actors.size()); - for (uint i = 0; i < _actors.size(); ++i) { - archive.writeString(_actors[i]->getName()); - _actors[i]->saveState(archive); - } + archive.writeWORD(_actors.size()); + for (uint i = 0; i < _actors.size(); ++i) { + archive.writeString(_actors[i]->getName()); + _actors[i]->saveState(archive); + } } void GamePage::unload() { - _leadActor->setAction(_leadActor->findAction(kIdleAction)); + _leadActor->setAction(_leadActor->findAction(kIdleAction)); - saveState(); - clear(); + saveState(); + clear(); - _isLoaded = false; + _isLoaded = false; } void GamePage::clear() { - Page::clear(); - //_variables.clear(1); + Page::clear(); + //_variables.clear(1); - for (uint i = 0; i < _handlers.size(); ++i) { - delete _handlers[i]; - } + for (uint i = 0; i < _handlers.size(); ++i) { + delete _handlers[i]; + } - _handlers.clear(); + _handlers.clear(); - delete _cursorMgr; _cursorMgr = nullptr; - delete _sequencer; _sequencer = nullptr; - delete _walkMgr; _walkMgr = nullptr; + delete _cursorMgr; _cursorMgr = nullptr; + delete _sequencer; _sequencer = nullptr; + delete _walkMgr; _walkMgr = nullptr; } } // End of namespace Pink diff --git a/engines/pink/objects/pages/game_page.h b/engines/pink/objects/pages/game_page.h index 5aad7ac66f..1bae58d768 100644 --- a/engines/pink/objects/pages/game_page.h +++ b/engines/pink/objects/pages/game_page.h @@ -36,39 +36,39 @@ class HandlerStartPage; class GamePage : public Page { public: - GamePage(); - ~GamePage(); - virtual void toConsole(); - virtual void deserialize(Archive &archive); + GamePage(); + ~GamePage(); + virtual void toConsole(); + virtual void deserialize(Archive &archive); - virtual void load(Archive &archive); - void unload(); - void loadManagers(); - void init(bool isLoadingSave); + virtual void load(Archive &archive); + void unload(); + void loadManagers(); + void init(bool isLoadingSave); - PinkEngine *getGame(); - Sequencer *getSequencer(); - WalkMgr *getWalkMgr(); - Module *getModule() const; + PinkEngine *getGame(); + Sequencer *getSequencer(); + WalkMgr *getWalkMgr(); + Module *getModule() const; - bool checkValueOfVariable(const Common::String &variable, const Common::String &value); - void setVariable(Common::String &variable, Common::String &value); + bool checkValueOfVariable(const Common::String &variable, const Common::String &value); + void setVariable(Common::String &variable, Common::String &value); - virtual void clear(); + virtual void clear(); private: - bool initHandler(); - void loadState(); - void saveState(); + bool initHandler(); + void loadState(); + void saveState(); - bool _isLoaded; - Common::MemoryReadWriteStream *_memFile; - Module *_module; - CursorMgr *_cursorMgr; - WalkMgr *_walkMgr; - Sequencer *_sequencer; - Array<HandlerStartPage*> _handlers; - Common::StringMap _variables; + bool _isLoaded; + Common::MemoryReadWriteStream *_memFile; + Module *_module; + CursorMgr *_cursorMgr; + WalkMgr *_walkMgr; + Sequencer *_sequencer; + Array<HandlerStartPage*> _handlers; + Common::StringMap _variables; }; } diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp index 4b2f5f1d49..1465e17b39 100644 --- a/engines/pink/objects/pages/page.cpp +++ b/engines/pink/objects/pages/page.cpp @@ -27,14 +27,14 @@ namespace Pink { Page::~Page() { - clear(); + clear(); } void Page::load(Archive &archive) { - archive.mapObject(this); - NamedObject::deserialize(archive); - archive.readString(); //skip directory - _actors.deserialize(archive); + archive.mapObject(this); + NamedObject::deserialize(archive); + archive.readString(); //skip directory + _actors.deserialize(archive); } Actor *Page::findActor(const Common::String &name) { @@ -47,52 +47,52 @@ Actor *Page::findActor(const Common::String &name) { } Sound *Page::loadSound(Common::String &fileName) { - return _resMgr.loadSound(fileName); + return _resMgr.loadSound(fileName); } CelDecoder *Page::loadCel(Common::String &fileName) { - return _resMgr.loadCEL(fileName); + return _resMgr.loadCEL(fileName); } void Page::toConsole() { - for (uint i = 0; i < _actors.size(); ++i) { - _actors[i]->toConsole(); - } + for (uint i = 0; i < _actors.size(); ++i) { + _actors[i]->toConsole(); + } } void Page::init() { - LeadActor::State state = _leadActor->getState(); - bool unk = (state == LeadActor::kInventory || state == LeadActor::kPDA); + LeadActor::State state = _leadActor->getState(); + bool unk = (state == LeadActor::kInventory || state == LeadActor::kPDA); - for (uint i = 0; i < _actors.size(); ++i) { - _actors[i]->init(unk); - } + for (uint i = 0; i < _actors.size(); ++i) { + _actors[i]->init(unk); + } } LeadActor *Page::getLeadActor() { - return _leadActor; + return _leadActor; } void Page::clear() { - for (uint i = 0; i < _actors.size(); ++i) { - delete _actors[i]; - } - _actors.clear(); - _resMgr.clear(); + for (uint i = 0; i < _actors.size(); ++i) { + delete _actors[i]; + } + _actors.clear(); + _resMgr.clear(); } void Page::pause() { - for (uint i = 0; i < _actors.size(); ++i) { - _actors[i]->pause(); - } + for (uint i = 0; i < _actors.size(); ++i) { + _actors[i]->pause(); + } } void Page::unpause() { - for (uint i = 0; i < _actors.size(); ++i) { - _actors[i]->unpause(); - } + for (uint i = 0; i < _actors.size(); ++i) { + _actors[i]->unpause(); + } } } // End of namespace Pink diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h index 1d96a93b5a..3b5708f530 100644 --- a/engines/pink/objects/pages/page.h +++ b/engines/pink/objects/pages/page.h @@ -34,26 +34,26 @@ class LeadActor; class Page : public NamedObject { public: - ~Page(); - virtual void toConsole(); + ~Page(); + virtual void toConsole(); - void load(Archive &archive); - Actor *findActor(const Common::String &name); - LeadActor *getLeadActor(); + void load(Archive &archive); + Actor *findActor(const Common::String &name); + LeadActor *getLeadActor(); - Sound *loadSound(Common::String &fileName); - CelDecoder *loadCel(Common::String &fileName); + Sound *loadSound(Common::String &fileName); + CelDecoder *loadCel(Common::String &fileName); - virtual void clear(); - void pause(); - void unpause(); + virtual void clear(); + void pause(); + void unpause(); protected: - void init(); + void init(); - Array<Actor*> _actors; - ResourceMgr _resMgr; - LeadActor *_leadActor; + Array<Actor*> _actors; + ResourceMgr _resMgr; + LeadActor *_leadActor; }; } // End of namespace Pink |