diff options
| author | Bendegúz Nagy | 2016-07-18 18:23:30 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | bd9fa3eb87a08dd7ba6387ac7c2d911a040cd9c4 (patch) | |
| tree | 0251546950c3eb79a73e0d332bb0f24763923da2 /engines/dm/group.h | |
| parent | ac1b49496d13f173bc08274808b1c1878e743a11 (diff) | |
| download | scummvm-rg350-bd9fa3eb87a08dd7ba6387ac7c2d911a040cd9c4.tar.gz scummvm-rg350-bd9fa3eb87a08dd7ba6387ac7c2d911a040cd9c4.tar.bz2 scummvm-rg350-bd9fa3eb87a08dd7ba6387ac7c2d911a040cd9c4.zip | |
DM: Engine now correctly set's the activeGroupIndex of groups
Diffstat (limited to 'engines/dm/group.h')
| -rw-r--r-- | engines/dm/group.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/dm/group.h b/engines/dm/group.h index fd7d98afe7..6578a20851 100644 --- a/engines/dm/group.h +++ b/engines/dm/group.h @@ -114,7 +114,6 @@ public: uint16 _type; uint16 _cells; uint16 _health[4]; -private: uint16 _flags; public: explicit Group(uint16 *rawDat) : _nextThing(rawDat[0]), _slot(rawDat[1]), _type(rawDat[2]), @@ -125,7 +124,7 @@ public: _health[3] = rawDat[7]; } - byte &getActiveGroupIndex() { return *(byte*)&_cells; } + uint16 &getActiveGroupIndex() { return _cells; } uint16 getBehaviour() { return _flags & 0xF; } uint16 setBehaviour(uint16 val) { _flags = (_flags & ~0xF) | (val & 0xF); return (val & 0xF); } |