thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DM: Fix some GCC warnings

Browse source
This commit is contained in:
Strangerke 2016-06-22 00:00:03 +02:00 • committed by Bendegúz Nagy
parent 3a2677eecf
commit 0f04a0902b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/dm/dungeonman.h
View file

@ -47,7 +47,7 @@ extern ObjectInfo gObjectInfo[180];
enum ArmourAttribute { enum ArmourAttribute {
kArmourAttributeIsAShield = 0x0080, // @ MASK0x0080_IS_A_SHIELD kArmourAttributeIsAShield = 0x0080, // @ MASK0x0080_IS_A_SHIELD
kArmourAttributeSharpDefense = 0x0007, // @ MASK0x0007_SHARP_DEFENSE kArmourAttributeSharpDefense = 0x0007 // @ MASK0x0007_SHARP_DEFENSE
}; };
class ArmourInfo { class ArmourInfo {
@ -476,9 +476,9 @@ public:
Square &set(SquareMask mask) { _data |= mask; return *this; } Square &set(SquareMask mask) { _data |= mask; return *this; }
byte get(SquareMask mask) { return _data & mask; } byte get(SquareMask mask) { return _data & mask; }
byte getDoorState() { return _data & 0x7; } // @ M36_DOOR_STATE 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 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 byte toByte() { return _data; } // I don't like 'em casts
}; };

2
engines/dm/gfx.h
View file

@ -13,7 +13,7 @@ enum ViewCell {
kViewCellBackRight = 2, // @ C02_VIEW_CELL_BACK_RIGHT kViewCellBackRight = 2, // @ C02_VIEW_CELL_BACK_RIGHT
kViewCellBackLeft = 3, // @ C03_VIEW_CELL_BACK_LEFT kViewCellBackLeft = 3, // @ C03_VIEW_CELL_BACK_LEFT
kViewCellAlcove = 4, // @ C04_VIEW_CELL_ALCOVE 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 { enum GraphicIndice {