diff options
| author | Strangerke | 2016-06-22 00:00:03 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | 0f04a0902b9b5dc3b83dc506a2155f679feeac0c (patch) | |
| tree | c63eb702e952e4ea184f476af8c27979acacaa53 | |
| parent | 3a2677eecfd5123fc186f056518f5ec242873a59 (diff) | |
| download | scummvm-rg350-0f04a0902b9b5dc3b83dc506a2155f679feeac0c.tar.gz scummvm-rg350-0f04a0902b9b5dc3b83dc506a2155f679feeac0c.tar.bz2 scummvm-rg350-0f04a0902b9b5dc3b83dc506a2155f679feeac0c.zip | |
DM: Fix some GCC warnings
| -rw-r--r-- | engines/dm/dungeonman.h | 6 | ||||
| -rw-r--r-- | engines/dm/gfx.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h index 9ab79512c7..7f6e9666ba 100644 --- a/engines/dm/dungeonman.h +++ b/engines/dm/dungeonman.h @@ -47,7 +47,7 @@ extern ObjectInfo gObjectInfo[180]; enum ArmourAttribute { kArmourAttributeIsAShield = 0x0080, // @ MASK0x0080_IS_A_SHIELD - kArmourAttributeSharpDefense = 0x0007, // @ MASK0x0007_SHARP_DEFENSE + kArmourAttributeSharpDefense = 0x0007 // @ MASK0x0007_SHARP_DEFENSE }; class ArmourInfo { @@ -476,9 +476,9 @@ public: Square &set(SquareMask mask) { _data |= mask; return *this; } byte get(SquareMask mask) { return _data & mask; } byte getDoorState() { return _data & 0x7; } // @ M36_DOOR_STATE - Square &setDoorState(byte state) { _data = ((_data & ~0x7) | state); } // @ M37_SET_DOOR_STATE + void setDoorState(byte state) { _data = ((_data & ~0x7) | state); } // @ M37_SET_DOOR_STATE SquareType getType() { return (SquareType)(_data >> 5); } // @ M34_SQUARE_TYPE - Square &setType(SquareType type) { _data = (_data & 0x1F) | type << 5; return *this; } + void setType(SquareType type) { _data = (_data & 0x1F) | type << 5; } byte toByte() { return _data; } // I don't like 'em casts }; diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 0c92214a0f..87d6bda69f 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -13,7 +13,7 @@ enum ViewCell { kViewCellBackRight = 2, // @ C02_VIEW_CELL_BACK_RIGHT kViewCellBackLeft = 3, // @ C03_VIEW_CELL_BACK_LEFT kViewCellAlcove = 4, // @ C04_VIEW_CELL_ALCOVE - kViewCellDoorButtonOrWallOrn = 5, // @ C05_VIEW_CELL_DOOR_BUTTON_OR_WALL_ORNAMENT + kViewCellDoorButtonOrWallOrn = 5 // @ C05_VIEW_CELL_DOOR_BUTTON_OR_WALL_ORNAMENT }; enum GraphicIndice { |