diff options
| author | Eugene Sandulenko | 2016-09-10 21:50:57 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-09-10 21:50:57 +0200 |
| commit | 786f2449293faaa914522239fafc74559dfb5c60 (patch) | |
| tree | 99e8a7de674ef7bd8684aebb65ca34d67888587c /engines/dm/champion.cpp | |
| parent | 7871874dab045b012d8a6f48fe1fb642eb0f68a6 (diff) | |
| download | scummvm-rg350-786f2449293faaa914522239fafc74559dfb5c60.tar.gz scummvm-rg350-786f2449293faaa914522239fafc74559dfb5c60.tar.bz2 scummvm-rg350-786f2449293faaa914522239fafc74559dfb5c60.zip | |
DM: Rename _B to _Bu to avoid name clashes on some platforms
Diffstat (limited to 'engines/dm/champion.cpp')
| -rw-r--r-- | engines/dm/champion.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/dm/champion.cpp b/engines/dm/champion.cpp index 6b895063ea..3d54fad827 100644 --- a/engines/dm/champion.cpp +++ b/engines/dm/champion.cpp @@ -130,11 +130,11 @@ void ChampionMan::initConstants() { 0x0400 /* Chest 8 Chest */ }; - _boxChampionPortrait = Box(0, 31, 0, 28); // @ G0047_s_Graphic562_Box_ChampionPortrait + _boxChampionPortrait = Box(0, 31, 0, 28); // @ G0047_s_Graphic562_Box_ChampionPortrait const char **baseSkillName; switch (_vm->getGameLanguage()) { // localized - case Common::EN_ANY: + case Common::EN_ANY: baseSkillName = g417_baseSkillName_EN_ANY; break; case Common::DE_DEU: @@ -927,7 +927,7 @@ void ChampionMan::disableAction(uint16 champIndex, uint16 ticks) { TimelineEvent curEvent; curEvent._type = k11_TMEventTypeEnableChampionAction; curEvent._priority = champIndex; - curEvent._B._slotOrdinal = 0; + curEvent._Bu._slotOrdinal = 0; int16 eventIndex = curChampion->_enableActionEventIndex; if (eventIndex >= 0) { @@ -1118,7 +1118,7 @@ void ChampionMan::championPoison(int16 champIndex, uint16 attack) { newEvent._type = k75_TMEventTypePoisonChampion; newEvent._priority = champIndex; setMapAndTime(newEvent._mapTime, _vm->_dungeonMan->_partyMapIndex, _vm->_gameTime + 36); - newEvent._B._attack = attack; + newEvent._Bu._attack = attack; _vm->_timeline->addEventGetEventIndex(&newEvent); } @@ -2113,8 +2113,8 @@ uint16 ChampionMan::getMaximumLoad(Champion *champ) { } void ChampionMan::drawChampionState(ChampionIndex champIndex) { - static Box boxMouth = Box(55, 72, 12, 29); // @ G0048_s_Graphic562_Box_Mouth - static Box boxEye = Box(11, 28, 12, 29); // @ G0049_s_Graphic562_Box_Eye + static Box boxMouth = Box(55, 72, 12, 29); // @ G0048_s_Graphic562_Box_Mouth + static Box boxEye = Box(11, 28, 12, 29); // @ G0049_s_Graphic562_Box_Eye int16 championStatusBoxX = champIndex * k69_ChampionStatusBoxSpacing; Champion *curChampion = &_champions[champIndex]; |