diff options
| author | Bendegúz Nagy | 2016-06-21 17:45:10 +0200 |
|---|---|---|
| committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
| commit | c986a71beabb7ba8f54a79f3b20735ab6a83e7e0 (patch) | |
| tree | 755238fbda6e1c9e7f5b1664830f940432258bfd /engines/dm/gfx.h | |
| parent | 2c669d4119c2e218010c7d1d2eca0b81be58a99b (diff) | |
| download | scummvm-rg350-c986a71beabb7ba8f54a79f3b20735ab6a83e7e0.tar.gz scummvm-rg350-c986a71beabb7ba8f54a79f3b20735ab6a83e7e0.tar.bz2 scummvm-rg350-c986a71beabb7ba8f54a79f3b20735ab6a83e7e0.zip | |
DM: Add F0292_CHAMPION_DrawState, G0407_s_Party, M26_CHAMPION_ICON_INDEX, several graphic indices, fix missing kPanelResurectReincaranteIndice value
Diffstat (limited to 'engines/dm/gfx.h')
| -rw-r--r-- | engines/dm/gfx.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/engines/dm/gfx.h b/engines/dm/gfx.h index 07dabce88a..0c92214a0f 100644 --- a/engines/dm/gfx.h +++ b/engines/dm/gfx.h @@ -33,7 +33,14 @@ enum GraphicIndice { kFoodLabelIndice = 30, // @ C030_GRAPHIC_FOOD_LABEL kWaterLabelIndice = 31, // @ C031_GRAPHIC_WATER_LABEL kPoisionedLabelIndice = 32, // @ C032_GRAPHIC_POISONED_LABEL - kPanelResurectReincaranteIndice // @ C040_GRAPHIC_PANEL_RESURRECT_REINCARNATE + kPanelResurectReincaranteIndice = 40, // @ C040_GRAPHIC_PANEL_RESURRECT_REINCARNATE + kBorderPartyShieldIndice = 37, // @ C037_GRAPHIC_BORDER_PARTY_SHIELD + kBorderPartyFireshieldIndice = 38, // @ C038_GRAPHIC_BORDER_PARTY_FIRESHIELD + kBorderPartySpellshieldIndice = 39, // @ C039_GRAPHIC_BORDER_PARTY_SPELLSHIELD + kStatusBoxDeadChampion = 8, // @ C008_GRAPHIC_STATUS_BOX_DEAD_CHAMPION + kSlotBoxNormalIndice = 33, // @ C033_GRAPHIC_SLOT_BOX_NORMAL + kSlotBoxWoundedIndice = 34, // @ C034_GRAPHIC_SLOT_BOX_WOUNDED + kChampionIcons = 28 // @ C028_GRAPHIC_CHAMPION_ICONS }; extern uint16 gPalSwoosh[16]; @@ -49,7 +56,7 @@ public: uint16 _y1; uint16 _y2; - Box(uint16 x1, uint16 x2, uint16 y1, uint16 y2): _x1(x1), _x2(x2 + 1), _y1(y1), _y2(y2 + 1) {} + Box(uint16 x1, uint16 x2, uint16 y1, uint16 y2) : _x1(x1), _x2(x2 + 1), _y1(y1), _y2(y2 + 1) {} Box() {} bool isPointInside(Common::Point point) { return (_x1 <= point.x) && (point.x < _x2) && (_y1 <= point.y) && (point.y < _y2); @@ -66,8 +73,8 @@ struct Frame { Frame() {} Frame(uint16 destFromX, uint16 destToX, uint16 destFromY, uint16 destToY, - uint16 srcWidth, uint16 srcHeight, uint16 srcX, uint16 srcY) : - _destFromX(destFromX), _destToX(destToX + 1), _destFromY(destFromY), _destToY(destToY + 1), + uint16 srcWidth, uint16 srcHeight, uint16 srcX, uint16 srcY) : + _destFromX(destFromX), _destToX(destToX + 1), _destFromY(destFromY), _destToY(destToY + 1), _srcWidth(srcWidth * 2), _srcHeight(srcHeight), _srcX(srcX), _srcY(srcY) {} }; |