diff options
author | whitertandrek | 2018-03-18 13:41:02 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | 5cf3d0e309d03abec502f986f65dc6144f972c54 (patch) | |
tree | c87623d2fd8c76e40a7cc551a35ebf9edfcd1831 | |
parent | 198710adac6c827a9db4b0640952d8ea88713ca2 (diff) | |
download | scummvm-rg350-5cf3d0e309d03abec502f986f65dc6144f972c54.tar.gz scummvm-rg350-5cf3d0e309d03abec502f986f65dc6144f972c54.tar.bz2 scummvm-rg350-5cf3d0e309d03abec502f986f65dc6144f972c54.zip |
PINK: Added LeadActor pointer field to WalkMgr
-rw-r--r-- | engines/pink/objects/named_object.h | 58 | ||||
-rw-r--r-- | engines/pink/walk/walk_mgr.cpp | 2 | ||||
-rw-r--r-- | engines/pink/walk/walk_mgr.h | 2 |
3 files changed, 3 insertions, 59 deletions
diff --git a/engines/pink/objects/named_object.h b/engines/pink/objects/named_object.h deleted file mode 100644 index a0136f7b0f..0000000000 --- a/engines/pink/objects/named_object.h +++ /dev/null @@ -1,58 +0,0 @@ -/* ScummVM - Graphic Adventure Engine - * - * ScummVM is the legal property of its developers, whose names - * are too numerous to list here. Please refer to the COPYRIGHT - * file distributed with this source distribution. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - */ - -#ifndef PINK_NAMED_OBJECT_H -#define PINK_NAMED_OBJECT_H - -#include "../archive.h" -#include <common/str.h> -#include "object.h" -#include <common/debug.h> - -namespace Pink { - -class NamedObject : public Object { -public: - NamedObject(){}; - NamedObject(const Common::String &name) - : _name(name) - {} - - void deserialize(Archive &archive){ - _name = archive.readString(); - debug("NamedObject %s loaded", _name.c_str()); - } - void store(Archive &archive){ - - } - - const Common::String &getName() const { - return _name; - } - -private: - Common::String _name; -}; - -} // End of namespace Pink - -#endif
\ No newline at end of file diff --git a/engines/pink/walk/walk_mgr.cpp b/engines/pink/walk/walk_mgr.cpp index f2b947bb9a..cf97d61fa9 100644 --- a/engines/pink/walk/walk_mgr.cpp +++ b/engines/pink/walk/walk_mgr.cpp @@ -7,6 +7,6 @@ void Pink::WalkMgr::deserialize(Pink::Archive &archive) { - // setLeadActorRef; + _leadActor = static_cast<LeadActor*>(archive.readObject()); archive >> _locations; } diff --git a/engines/pink/walk/walk_mgr.h b/engines/pink/walk/walk_mgr.h index 27321cf7cb..857268da35 100644 --- a/engines/pink/walk/walk_mgr.h +++ b/engines/pink/walk/walk_mgr.h @@ -29,12 +29,14 @@ namespace Pink { class WalkLocation; +class LeadActor; class WalkMgr : public Object { public: virtual void deserialize(Archive &archive); private: + LeadActor *_leadActor; Common::Array<WalkLocation*> _locations; }; |