diff options
author | whitertandrek | 2018-03-17 20:27:03 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | f8055bc2067d369e13b056d723512f198c10f973 (patch) | |
tree | 6110a22232e31e7db691a981e9f6c30545303f01 /engines/pink/objects/module.h | |
parent | 4ff13d64ba3812a0847ef9f0634581ba0715e075 (diff) | |
download | scummvm-rg350-f8055bc2067d369e13b056d723512f198c10f973.tar.gz scummvm-rg350-f8055bc2067d369e13b056d723512f198c10f973.tar.bz2 scummvm-rg350-f8055bc2067d369e13b056d723512f198c10f973.zip |
PINK: split declaration and definition and some fixes
Diffstat (limited to 'engines/pink/objects/module.h')
-rw-r--r-- | engines/pink/objects/module.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/engines/pink/objects/module.h b/engines/pink/objects/module.h index c6dbdbe31a..ea2eceef7d 100644 --- a/engines/pink/objects/module.h +++ b/engines/pink/objects/module.h @@ -36,24 +36,18 @@ namespace Pink { class ModuleProxy : public NamedObject { public: - ModuleProxy(){}; - ModuleProxy(const Common::String &name) - : NamedObject(name) - {} - - + ModuleProxy(); + ModuleProxy(const Common::String &name); }; class PinkEngine; class Module : public NamedObject { public: - Module(PinkEngine *game, const Common::String &name) - : NamedObject(name), _game(game), _page(nullptr) - {} + Module(PinkEngine *game, const Common::String &name); - void deserialize(Archive &archive); - void initPage(bool isLoadingSave, const Common::String *pageName); + void load(Archive &archive); + void init(bool isLoadingSave, const Common::String *pageName); void OnLeftButtonDown(); void OnMouseMove(); @@ -61,7 +55,6 @@ public: private: PinkEngine *_game; - //Common::String _directory; doesn't need this because it was used when game had data in directories GamePage *_page; PagesArray _pages; InventoryMgr _invMgr; |