diff options
| -rw-r--r-- | engines/xeen/interface.cpp | 12 | ||||
| -rw-r--r-- | engines/xeen/interface.h | 1 | ||||
| -rw-r--r-- | engines/xeen/town.cpp | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/engines/xeen/interface.cpp b/engines/xeen/interface.cpp index 959252d65e..d3face1986 100644 --- a/engines/xeen/interface.cpp +++ b/engines/xeen/interface.cpp @@ -43,7 +43,7 @@ PartyDrawer::PartyDrawer(XeenEngine *vm): _vm(vm) { _restoreSprites.load("restorex.icn"); _hpSprites.load("hpbars.icn"); _dseFace.load("dse.fac"); - _hiliteChar = -1; + _hiliteChar = HILIGHT_CHAR_NONE; } void PartyDrawer::drawParty(bool updateFlag) { @@ -88,7 +88,7 @@ void PartyDrawer::drawParty(bool updateFlag) { _hpSprites.draw(screen, frame, Common::Point(Res.HP_BARS_X[idx], 182)); } - if (_hiliteChar != -1) + if (_hiliteChar != HILIGHT_CHAR_NONE) res._globalSprites.draw(screen, 8, Common::Point(Res.CHAR_FACES_X[_hiliteChar] - 1, 149)); if (updateFlag) @@ -101,7 +101,7 @@ void PartyDrawer::highlightChar(int charId) { if (charId != _hiliteChar && _hiliteChar != HILIGHT_CHAR_DISABLED) { // Handle deselecting any previusly selected char - if (_hiliteChar != -1) { + if (_hiliteChar != HILIGHT_CHAR_NONE) { res._globalSprites.draw(screen, 9 + _hiliteChar, Common::Point(Res.CHAR_FACES_X[_hiliteChar] - 1, 149)); } @@ -117,16 +117,16 @@ void PartyDrawer::unhighlightChar() { Resources &res = *_vm->_resources; Screen &screen = *_vm->_screen; - if (_hiliteChar != -1) { + if (_hiliteChar != HILIGHT_CHAR_NONE) { res._globalSprites.draw(screen, _hiliteChar + 9, Common::Point(Res.CHAR_FACES_X[_hiliteChar] - 1, 149)); - _hiliteChar = -1; + _hiliteChar = HILIGHT_CHAR_NONE; screen._windows[33].update(); } } void PartyDrawer::resetHighlight() { - _hiliteChar = -1; + _hiliteChar = HILIGHT_CHAR_NONE; } /*------------------------------------------------------------------------*/ diff --git a/engines/xeen/interface.h b/engines/xeen/interface.h index 074d7fdafb..ce887d2ae9 100644 --- a/engines/xeen/interface.h +++ b/engines/xeen/interface.h @@ -35,6 +35,7 @@ class XeenEngine; #define MINIMAP_SIZE 7 #define HILIGHT_CHAR_DISABLED -2 +#define HILIGHT_CHAR_NONE -1 /** * Class responsible for drawing the images of the characters in the party diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp index 0f6726c9eb..ac1fc1edbb 100644 --- a/engines/xeen/town.cpp +++ b/engines/xeen/town.cpp @@ -258,14 +258,14 @@ int Town::townAction(TownAction actionId) { } break; - case TAVERN: { + case TAVERN: // Leave Tavern sound.stopSound(); sound.playSound(isDarkCc ? "gdluck1.voc" : "goodbye.voc", 1); map.mazeData()._mazeNumber = party._mazeId; break; - } + default: break; } |