diff options
| author | Eugene Sandulenko | 2015-12-25 12:49:47 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2015-12-27 15:41:02 +0100 |
| commit | 5f2ef620c18b36fe0d480474135aa78eb9eb0c01 (patch) | |
| tree | 79944e688a45bc14b2f59e86404ceea35c076070 /engines/wage/entities.h | |
| parent | 59b2809f3740923cc63477a25eaabde2535f6f2e (diff) | |
| download | scummvm-rg350-5f2ef620c18b36fe0d480474135aa78eb9eb0c01.tar.gz scummvm-rg350-5f2ef620c18b36fe0d480474135aa78eb9eb0c01.tar.bz2 scummvm-rg350-5f2ef620c18b36fe0d480474135aa78eb9eb0c01.zip | |
WAGE: Implemented World::move(Obj *obj, Chr *chr)
Diffstat (limited to 'engines/wage/entities.h')
| -rw-r--r-- | engines/wage/entities.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/wage/entities.h b/engines/wage/entities.h index 7573cc81b1..d24252f575 100644 --- a/engines/wage/entities.h +++ b/engines/wage/entities.h @@ -201,7 +201,7 @@ public: String _dyingWords; Scene *_currentScene; - Common::Array<Obj> _inventory; + Common::Array<Obj *> _inventory; Obj *_armor[NUMBER_OF_ARMOR_TYPES]; @@ -354,6 +354,9 @@ public: if (currentScene != NULL) _currentOwner = NULL; } + + Chr *removeFromChr(); + Designed *removeFromCharOrScene(); }; class Scene : public Designed { @@ -383,8 +386,8 @@ public: int _worldX; int _worldY; - Common::List<Obj> _objs; - Common::List<Chr> _chrs; + Common::List<Obj *> _objs; + Common::List<Chr *> _chrs; Scene() {} Scene(String name, Common::SeekableReadStream *data); |