aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/champion.cpp
diff options
context:
space:
mode:
authorBendegúz Nagy2016-07-02 02:58:44 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commitce45a71ba0d294f5282c05859ac4097d26482b44 (patch)
treea685d41fd5fe9c311c79fe072d6740c55664fd30 /engines/dm/champion.cpp
parenta9cda9df7c4f03aadf080c6c166b7a1a02987a1b (diff)
downloadscummvm-rg350-ce45a71ba0d294f5282c05859ac4097d26482b44.tar.gz
scummvm-rg350-ce45a71ba0d294f5282c05859ac4097d26482b44.tar.bz2
scummvm-rg350-ce45a71ba0d294f5282c05859ac4097d26482b44.zip
DM: More renaming
Diffstat (limited to 'engines/dm/champion.cpp')
-rw-r--r--engines/dm/champion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp
index b8dac7ff3e..0e062bbee6 100644
--- a/engines/dm/champion.cpp
+++ b/engines/dm/champion.cpp
@@ -852,7 +852,7 @@ void ChampionMan::drawChampionState(ChampionIndex champIndex) {
{ // block so goto won't skip AL_0_championIconIndex initialization
int16 AL_0_championIconIndex = championIconIndex(champ->_cell, _vm->_dungeonMan->_currMap._g308_partyDir);
- if ((champAttributes & k28_ChampionIcons) && (eventMan._useChampionIconOrdinalAsMousePointerBitmap != _vm->indexToOrdinal(AL_0_championIconIndex))) {
+ if ((champAttributes & k28_ChampionIcons) && (eventMan._g599_useChampionIconOrdinalAsMousePointerBitmap != _vm->indexToOrdinal(AL_0_championIconIndex))) {
dispMan.clearScreenBox(g46_ChampionColor[champIndex], g54_BoxChampionIcons[AL_0_championIconIndex]);
dispMan.blitToScreen(dispMan.getBitmap(k28_ChampionIcons), 80, championIconIndex(champ->_dir, _vm->_dungeonMan->_currMap._g308_partyDir) * 19, 0,
g54_BoxChampionIcons[AL_0_championIconIndex], k12_ColorDarkestGray);
@@ -1006,7 +1006,7 @@ void ChampionMan::renameChampion(Champion* champ) {
static Box okButtonBox(197, 215, 147, 155); // inclusive boundaries, constructor adds +1
for (;;) {
_vm->_eventMan->processInput();
- if (_vm->_eventMan->hasPendingClick(clickPos, kLeftMouseButton) && okButtonBox.isPointInside(clickPos)) {
+ if (_vm->_eventMan->hasPendingClick(clickPos, k1_LeftMouseButton) && okButtonBox.isPointInside(clickPos)) {
return;
}
dispMan.updateScreen();