diff options
| author | Strangerke | 2016-06-22 00:16:21 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | b97535ef698f3fda7dac27ee39499d67aed1418c (patch) | |
| tree | 5260be61d4b01d886d1099502611354f115f268f | |
| parent | 0f04a0902b9b5dc3b83dc506a2155f679feeac0c (diff) | |
| download | scummvm-rg350-b97535ef698f3fda7dac27ee39499d67aed1418c.tar.gz scummvm-rg350-b97535ef698f3fda7dac27ee39499d67aed1418c.tar.bz2 scummvm-rg350-b97535ef698f3fda7dac27ee39499d67aed1418c.zip | |
DM: Fix some more GCC warnings
| -rw-r--r-- | engines/dm/champion.h | 6 | ||||
| -rw-r--r-- | engines/dm/inventory.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/dm/champion.h b/engines/dm/champion.h index f8ea79c82f..2428308c3e 100644 --- a/engines/dm/champion.h +++ b/engines/dm/champion.h @@ -15,9 +15,9 @@ public: uint16 getMapY() { return (_scent >> 5) & 0x1F; } uint16 getMapIndex() { return (_scent >> 10) & 0x3F; } - uint16 setMapX(uint16 val) { _scent = (_scent & ~0x1F) & (val & 0x1F); } - uint16 setMapY(uint16 val) { _scent = (_scent & ~(0x1F << 5)) & (val & 0x1F); } - uint16 setMapIndex(uint16 val) { _scent = (_scent & ~(0x1F << 10)) & (val & 0x3F); } + void setMapX(uint16 val) { _scent = (_scent & ~0x1F) & (val & 0x1F); } + void setMapY(uint16 val) { _scent = (_scent & ~(0x1F << 5)) & (val & 0x1F); } + void setMapIndex(uint16 val) { _scent = (_scent & ~(0x1F << 10)) & (val & 0x3F); } }; // @ SCENT class Party { diff --git a/engines/dm/inventory.h b/engines/dm/inventory.h index 32c3d451ae..aa75dc0d6d 100644 --- a/engines/dm/inventory.h +++ b/engines/dm/inventory.h @@ -34,4 +34,4 @@ public: }; -}
\ No newline at end of file +} |