diff options
| -rw-r--r-- | engines/dm/gfx.cpp | 64 | ||||
| -rw-r--r-- | engines/dm/group.cpp | 8 | ||||
| -rw-r--r-- | engines/dm/inventory.cpp | 43 | ||||
| -rw-r--r-- | engines/dm/loadsave.cpp | 4 | ||||
| -rw-r--r-- | engines/dm/lzw.h | 2 | ||||
| -rw-r--r-- | engines/dm/menus.cpp | 115 |
6 files changed, 121 insertions, 115 deletions
diff --git a/engines/dm/gfx.cpp b/engines/dm/gfx.cpp index 0b5fa47656..9349587f21 100644 --- a/engines/dm/gfx.cpp +++ b/engines/dm/gfx.cpp @@ -2628,7 +2628,7 @@ bool DisplayMan::isDrawnWallOrnAnAlcove(int16 wallOrnOrd, ViewWall viewWallIndex unsigned char inscriptionString[70]; bool isInscription = (wallOrnamentIndex == _vm->_dungeonMan->_currMapInscriptionWallOrnIndex); if (isInscription) - _vm->_dungeonMan->decodeText((char*)inscriptionString, _inscriptionThing, k0_TextTypeInscription); + _vm->_dungeonMan->decodeText((char *)inscriptionString, _inscriptionThing, k0_TextTypeInscription); int16 blitPosX; byte *ornBlitBitmap; @@ -3234,14 +3234,14 @@ T0115015_DrawProjectileAsObject: ActiveGroup *activeGroup; if (group == nullptr) { /* If all creature data and info has not already been gathered */ - group = (Group*)_vm->_dungeonMan->getThingData(groupThing); + group = (Group *)_vm->_dungeonMan->getThingData(groupThing); activeGroup = &_vm->_groupMan->_activeGroups[group->getActiveGroupIndex()]; CreatureInfo *creatureInfo = &_vm->_dungeonMan->_creatureInfos[group->_type]; creatureAspectStruct = &_creatureAspects219[creatureInfo->_creatureAspectIndex]; creatureSize = getFlag(creatureInfo->_attributes, k0x0003_MaskCreatureInfo_size); creatureGraphicInfoGreen = creatureInfo->_graphicInfo; } - objectAspect = (ObjectAspect*)creatureAspectStruct; + objectAspect = (ObjectAspect *)creatureAspectStruct; AL_0_creatureIndexRed = _vm->_groupMan->getCreatureOrdinalInCell(group, cellYellowBear); if (AL_0_creatureIndexRed) { /* If there is a creature on the cell being processed */ @@ -3297,12 +3297,12 @@ T0115015_DrawProjectileAsObject: viewSquareIndex--; T0115077_DrawSecondHalfSquareCreature: - coordinateSet = creatureCoordinateSets[((CreatureAspect*)objectAspect)->getCoordSet()][viewSquareIndex][AL_2_viewCell]; + coordinateSet = creatureCoordinateSets[((CreatureAspect *)objectAspect)->getCoordSet()][viewSquareIndex][AL_2_viewCell]; if (!coordinateSet[1]) goto T0115126_CreatureNotVisible; AL_0_creatureGraphicInfoRed = creatureGraphicInfoGreen; - AL_4_nativeBitmapIndex = k446_FirstCreatureGraphicIndice + ((CreatureAspect*)objectAspect)->_firstNativeBitmapRelativeIndex; /* By default, assume using the front image */ - derivedBitmapIndex = ((CreatureAspect*)objectAspect)->_firstDerivedBitmapIndex; + AL_4_nativeBitmapIndex = k446_FirstCreatureGraphicIndice + ((CreatureAspect *)objectAspect)->_firstNativeBitmapRelativeIndex; /* By default, assume using the front image */ + derivedBitmapIndex = ((CreatureAspect *)objectAspect)->_firstDerivedBitmapIndex; int16 sourceByteWidth; int16 sourceHeight; useCreatureSideBitmap = getFlag(AL_0_creatureGraphicInfoRed, k0x0008_CreatureInfoGraphicMaskSide) && (creatureDirectionDelta & 0x0001); @@ -3310,15 +3310,15 @@ T0115077_DrawSecondHalfSquareCreature: useCreatureAttackBitmap = useFlippedHorizontallyCreatureFrontImage = useCreatureBackBitmap = false; AL_4_nativeBitmapIndex++; /* Skip the front image. Side image is right after the front image */ derivedBitmapIndex += 2; - sourceByteWidth = byteWidth = ((CreatureAspect*)objectAspect)->_byteWidthSide; - sourceHeight = heightRedEagle = ((CreatureAspect*)objectAspect)->_heightSide; + sourceByteWidth = byteWidth = ((CreatureAspect *)objectAspect)->_byteWidthSide; + sourceHeight = heightRedEagle = ((CreatureAspect *)objectAspect)->_heightSide; } else { useCreatureBackBitmap = getFlag(AL_0_creatureGraphicInfoRed, k0x0010_CreatureInfoGraphicMaskBack) && (creatureDirectionDelta == 0); useCreatureAttackBitmap = !useCreatureBackBitmap && getFlag(creatureAspectInt, k0x0080_MaskActiveGroupIsAttacking) && getFlag(AL_0_creatureGraphicInfoRed, k0x0020_CreatureInfoGraphicMaskAttack); if (useCreatureAttackBitmap) { useFlippedHorizontallyCreatureFrontImage = false; - sourceByteWidth = byteWidth = ((CreatureAspect*)objectAspect)->_byteWidthAttack; - sourceHeight = heightRedEagle = ((CreatureAspect*)objectAspect)->_heightAttack; + sourceByteWidth = byteWidth = ((CreatureAspect *)objectAspect)->_byteWidthAttack; + sourceHeight = heightRedEagle = ((CreatureAspect *)objectAspect)->_heightAttack; AL_4_nativeBitmapIndex++; /* Skip the front image */ derivedBitmapIndex += 2; if (getFlag(AL_0_creatureGraphicInfoRed, k0x0008_CreatureInfoGraphicMaskSide)) { @@ -3331,8 +3331,8 @@ T0115077_DrawSecondHalfSquareCreature: derivedBitmapIndex += 2; } } else { - sourceByteWidth = byteWidth = ((CreatureAspect*)objectAspect)->_byteWidthFront; - sourceHeight = heightRedEagle = ((CreatureAspect*)objectAspect)->_heightFront; + sourceByteWidth = byteWidth = ((CreatureAspect *)objectAspect)->_byteWidthFront; + sourceHeight = heightRedEagle = ((CreatureAspect *)objectAspect)->_heightFront; if (useCreatureBackBitmap) { useFlippedHorizontallyCreatureFrontImage = false; if (getFlag(AL_0_creatureGraphicInfoRed, k0x0008_CreatureInfoGraphicMaskSide)) { @@ -3363,7 +3363,7 @@ T0115077_DrawSecondHalfSquareCreature: if (viewSquareIndex >= k6_ViewSquare_D1C) { /* Creature is on D1 */ creaturePaddingPixelCount = 0; AL_8_shiftSetIndex = k0_ShiftSet_D0BackD1Front; - transparentColor = ((CreatureAspect*)objectAspect)->getTranspColour(); + transparentColor = ((CreatureAspect *)objectAspect)->getTranspColour(); if (useCreatureSideBitmap) { bitmapRedBanana = getNativeBitmapOrGraphic(AL_4_nativeBitmapIndex); if (creatureDirectionDelta == 1) { @@ -3405,7 +3405,7 @@ T0115077_DrawSecondHalfSquareCreature: byteWidth = getScaledDimension(sourceByteWidth, scale); heightRedEagle = getScaledDimension(sourceHeight, scale); - transparentColor = paletteChanges[((CreatureAspect*)objectAspect)->getTranspColour()] / 10; + transparentColor = paletteChanges[((CreatureAspect *)objectAspect)->getTranspColour()] / 10; bool derivedBitmapInCache = isDerivedBitmapInCache(derivedBitmapIndex); if (derivedBitmapInCache) @@ -3484,25 +3484,25 @@ T0115129_DrawProjectiles: thingParam = firstThingToDraw; /* Restart processing list of objects from the beginning. The next loop draws only projectile objects among the list */ do { if ((thingParam.getType() == k14_ProjectileThingType) && (thingParam.getCell() == cellYellowBear)) { - Projectile *projectile = (Projectile*)_vm->_dungeonMan->getThingData(thingParam); + Projectile *projectile = (Projectile *)_vm->_dungeonMan->getThingData(thingParam); if ((AL_4_projectileAspect = _vm->_dungeonMan->getProjectileAspect(projectile->_slot)) < 0) { /* Negative value: projectile aspect is the ordinal of a PROJECTIL_ASPECT */ - objectAspect = (ObjectAspect*)&_projectileAspect[_vm->ordinalToIndex(-AL_4_projectileAspect)]; - AL_4_nativeBitmapIndex = ((ProjectileAspect*)objectAspect)->_firstNativeBitmapRelativeIndex + k316_FirstProjectileGraphicIndice; - projectileAspectType = getFlag(((ProjectileAspect*)objectAspect)->_graphicInfo, k0x0003_ProjectileAspectTypeMask); + objectAspect = (ObjectAspect *)&_projectileAspect[_vm->ordinalToIndex(-AL_4_projectileAspect)]; + AL_4_nativeBitmapIndex = ((ProjectileAspect *)objectAspect)->_firstNativeBitmapRelativeIndex + k316_FirstProjectileGraphicIndice; + projectileAspectType = getFlag(((ProjectileAspect *)objectAspect)->_graphicInfo, k0x0003_ProjectileAspectTypeMask); - bool doNotScaleWithKineticEnergy = !getFlag(((ProjectileAspect*)objectAspect)->_graphicInfo, k0x0100_ProjectileScaleWithKineticEnergyMask); + bool doNotScaleWithKineticEnergy = !getFlag(((ProjectileAspect *)objectAspect)->_graphicInfo, k0x0100_ProjectileScaleWithKineticEnergyMask); if ((doNotScaleWithKineticEnergy || (projectile->_kineticEnergy == 255)) && (viewSquareIndex == k9_ViewSquare_D0C)) { scale = 0; /* Use native bitmap without resizing */ - byteWidth = ((ProjectileAspect*)objectAspect)->_byteWidth; - heightRedEagle = ((ProjectileAspect*)objectAspect)->_height; + byteWidth = ((ProjectileAspect *)objectAspect)->_byteWidth; + heightRedEagle = ((ProjectileAspect *)objectAspect)->_height; } else { AL_8_projectileScaleIndex = ((viewSquareIndex / 3) << 1) + (AL_2_viewCell >> 1); scale = _projectileScales[AL_8_projectileScaleIndex]; if (!doNotScaleWithKineticEnergy) { scale = (scale * MAX(96, projectile->_kineticEnergy + 1)) >> 8; } - byteWidth = getScaledDimension(((ProjectileAspect*)objectAspect)->_byteWidth, scale); - heightRedEagle = getScaledDimension(((ProjectileAspect*)objectAspect)->_height, scale); + byteWidth = getScaledDimension(((ProjectileAspect *)objectAspect)->_byteWidth, scale); + heightRedEagle = getScaledDimension(((ProjectileAspect *)objectAspect)->_height, scale); } bool projectileAspectTypeHasBackGraphicAndRotation = (projectileAspectType == k0_ProjectileAspectHasBackGraphicRotation); if (projectileAspectTypeHasBackGraphicAndRotation) @@ -3533,7 +3533,7 @@ T0115129_DrawProjectiles: projectileBitmapIndexDelta = 1; flipVertical = projectileAspectTypeHasBackGraphicAndRotation && (AL_2_viewCell < k2_ViewCellBackRight); - flipHorizontal = getFlag(((ProjectileAspect*)objectAspect)->_graphicInfo, k0x0010_ProjectileSideMask) && !((viewLane == k2_ViewLaneRight) || (!viewLane && ((AL_2_viewCell == k1_ViewCellFrontRight) || (AL_2_viewCell == k2_ViewCellBackRight)))); + flipHorizontal = getFlag(((ProjectileAspect *)objectAspect)->_graphicInfo, k0x0010_ProjectileSideMask) && !((viewLane == k2_ViewLaneRight) || (!viewLane && ((AL_2_viewCell == k1_ViewCellFrontRight) || (AL_2_viewCell == k2_ViewCellBackRight)))); } AL_4_nativeBitmapIndex += projectileBitmapIndexDelta; @@ -3544,7 +3544,7 @@ T0115129_DrawProjectiles: if (flipHorizontal) paddingPixelCount = (7 - ((byteWidth - 1) & 0x0007)) << 1; - if (doNotScaleWithKineticEnergy && isDerivedBitmapInCache(derivedBitmapIndex = k282_DerivedBitmapFirstProjectile + ((ProjectileAspect*)objectAspect)->_firstDerivedBitmapRelativeIndex + (projectileBitmapIndexDelta * 6) + AL_8_projectileScaleIndex)) { + if (doNotScaleWithKineticEnergy && isDerivedBitmapInCache(derivedBitmapIndex = k282_DerivedBitmapFirstProjectile + ((ProjectileAspect *)objectAspect)->_firstDerivedBitmapRelativeIndex + (projectileBitmapIndexDelta * 6) + AL_8_projectileScaleIndex)) { bitmapRedBanana = getDerivedBitmap(derivedBitmapIndex); } else { bitmapGreenAnt = getNativeBitmapOrGraphic(AL_4_nativeBitmapIndex); @@ -3553,7 +3553,7 @@ T0115129_DrawProjectiles: else bitmapRedBanana = _tmpBitmap; - blitToBitmapShrinkWithPalChange(bitmapGreenAnt, bitmapRedBanana, ((ProjectileAspect*)objectAspect)->_byteWidth << 1, ((ProjectileAspect*)objectAspect)->_height, byteWidth << 1, heightRedEagle, _palChangesProjectile[AL_8_projectileScaleIndex >> 1]); + blitToBitmapShrinkWithPalChange(bitmapGreenAnt, bitmapRedBanana, ((ProjectileAspect *)objectAspect)->_byteWidth << 1, ((ProjectileAspect *)objectAspect)->_height, byteWidth << 1, heightRedEagle, _palChangesProjectile[AL_8_projectileScaleIndex >> 1]); if (doNotScaleWithKineticEnergy) { addDerivedBitmap(derivedBitmapIndex); } @@ -3613,7 +3613,7 @@ T0115171_BackFromT0115015_DrawProjectileAsObject:; do { if (thingParam.getType() == k15_ExplosionThingType) { AL_2_cellPurpleMan = thingParam.getCell(); - Explosion *explosion = (Explosion*)_vm->_dungeonMan->getThingData(thingParam); + Explosion *explosion = (Explosion *)_vm->_dungeonMan->getThingData(thingParam); bool rebirthExplosion = ((uint16)(AL_4_explosionType = explosion->getType()) >= k100_ExplosionType_RebirthStep1); if (rebirthExplosion && ((AL_1_viewSquareExplosionIndex < k3_ViewSquare_D3C_Explosion) || (AL_1_viewSquareExplosionIndex > k9_ViewSquare_D1C_Explosion) || (AL_2_cellPurpleMan != cellYellowBear))) /* If explosion is rebirth and is not visible */ continue; @@ -3629,13 +3629,13 @@ T0115171_BackFromT0115015_DrawProjectileAsObject:; AL_4_explosionAspectIndex = k3_ExplosionAspectSmoke; } else { if (AL_4_explosionType == k100_ExplosionType_RebirthStep1) { - objectAspect = (ObjectAspect*)&_projectileAspect[_vm->ordinalToIndex(-_vm->_dungeonMan->getProjectileAspect(Thing::_explLightningBolt))]; - bitmapRedBanana = getNativeBitmapOrGraphic(((ProjectileAspect*)objectAspect)->_firstNativeBitmapRelativeIndex + (k316_FirstProjectileGraphicIndice + 1)); + objectAspect = (ObjectAspect *)&_projectileAspect[_vm->ordinalToIndex(-_vm->_dungeonMan->getProjectileAspect(Thing::_explLightningBolt))]; + bitmapRedBanana = getNativeBitmapOrGraphic(((ProjectileAspect *)objectAspect)->_firstNativeBitmapRelativeIndex + (k316_FirstProjectileGraphicIndice + 1)); explosionCoordinates = rebirthStep1ExplosionCoordinates[AL_1_viewSquareExplosionIndex - 3]; - byteWidth = getScaledDimension((((ProjectileAspect*)objectAspect)->_byteWidth), explosionCoordinates[2]); - heightRedEagle = getScaledDimension((((ProjectileAspect*)objectAspect)->_height), explosionCoordinates[2]); + byteWidth = getScaledDimension((((ProjectileAspect *)objectAspect)->_byteWidth), explosionCoordinates[2]); + heightRedEagle = getScaledDimension((((ProjectileAspect *)objectAspect)->_height), explosionCoordinates[2]); if (AL_1_viewSquareExplosionIndex != k9_ViewSquare_D1C_Explosion) { - blitToBitmapShrinkWithPalChange(bitmapRedBanana, _tmpBitmap, ((ProjectileAspect*)objectAspect)->_byteWidth << 1, ((ProjectileAspect*)objectAspect)->_height, byteWidth << 1, heightRedEagle, _palChangesNoChanges); + blitToBitmapShrinkWithPalChange(bitmapRedBanana, _tmpBitmap, ((ProjectileAspect *)objectAspect)->_byteWidth << 1, ((ProjectileAspect *)objectAspect)->_height, byteWidth << 1, heightRedEagle, _palChangesNoChanges); bitmapRedBanana = _tmpBitmap; } goto T0115200_DrawExplosion; diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp index fe80a1013c..160c97de99 100644 --- a/engines/dm/group.cpp +++ b/engines/dm/group.cpp @@ -1727,7 +1727,7 @@ Thing GroupMan::groupGetGenerated(int16 creatureType, int16 healthMultiplier, ui || (groupThing == Thing::_none)) { return Thing::_none; } - Group *group = (Group*)_vm->_dungeonMan->getThingData(groupThing); + Group *group = (Group *)_vm->_dungeonMan->getThingData(groupThing); group->_slot = Thing::_endOfList; group->setDoNotDiscard(false); group->setDir(dir); @@ -1776,7 +1776,7 @@ int16 GroupMan::getMeleeTargetCreatureOrdinal(int16 groupX, int16 groupY, int16 if (groupThing == Thing::_endOfList) return 0; - Group *group = (Group*)_vm->_dungeonMan->getThingData(groupThing); + Group *group = (Group *)_vm->_dungeonMan->getThingData(groupThing); signed char orderedCellsToAttack[4]; setOrderedCellsToAttack(orderedCellsToAttack, groupX, groupY, partyX, partyY, champCell); uint16 counter = 0; @@ -1882,7 +1882,7 @@ void GroupMan::fluxCageAction(int16 mapX, int16 mapY) { return; _vm->_dungeonMan->linkThingToList(unusedThing, Thing(0), mapX, mapY); - (((Explosion*)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[unusedThing.getIndex()]).setType(k50_ExplosionType_Fluxcage); + (((Explosion *)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[unusedThing.getIndex()]).setType(k50_ExplosionType_Fluxcage); TimelineEvent newEvent; setMapAndTime(newEvent._mapTime, _vm->_dungeonMan->_currMapIndex, _vm->_gameTime + 100); newEvent._type = k24_TMEventTypeRemoveFluxcage; @@ -1935,7 +1935,7 @@ bool GroupMan::isFluxcageOnSquare(int16 mapX, int16 mapY) { Thing thing = _vm->_dungeonMan->getSquareFirstThing(mapX, mapY); while (thing != Thing::_endOfList) { - if ((thing.getType() == k15_ExplosionThingType) && (((Explosion*)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[thing.getIndex()].getType() == k50_ExplosionType_Fluxcage)) + if ((thing.getType() == k15_ExplosionThingType) && (((Explosion *)_vm->_dungeonMan->_thingData[k15_ExplosionThingType])[thing.getIndex()].getType() == k50_ExplosionType_Fluxcage)) return true; thing = _vm->_dungeonMan->getNextThing(thing); diff --git a/engines/dm/inventory.cpp b/engines/dm/inventory.cpp index 9c12835973..c28e414cf5 100644 --- a/engines/dm/inventory.cpp +++ b/engines/dm/inventory.cpp @@ -273,7 +273,7 @@ void InventoryMan::closeChest() { bool processFirstChestSlot = true; if (_openChest == Thing::_none) return; - Container *container = (Container*)dunMan.getThingData(_openChest); + Container *container = (Container *)dunMan.getThingData(_openChest); _openChest = Thing::_none; container->getSlot() = Thing::_endOfList; Thing prevThing; @@ -294,8 +294,8 @@ void InventoryMan::closeChest() { } } -void InventoryMan::drawPanelScrollTextLine(int16 yPos, char* text) { - for (char* iter = text; *iter != '\0'; ++iter) { +void InventoryMan::drawPanelScrollTextLine(int16 yPos, char *text) { + for (char *iter = text; *iter != '\0'; ++iter) { if ((*iter >= 'A') && (*iter <= 'Z')) *iter -= 64; else if (*iter >= '{') // this branch is CHANGE5_03_IMPROVEMENT @@ -304,7 +304,7 @@ void InventoryMan::drawPanelScrollTextLine(int16 yPos, char* text) { _vm->_textMan->printToViewport(162 - (6 * strlen(text) / 2), yPos, k0_ColorBlack, text, k15_ColorWhite); } -void InventoryMan::drawPanelScroll(Scroll* scroll) { +void InventoryMan::drawPanelScroll(Scroll *scroll) { DisplayMan &dispMan = *_vm->_displayMan; char stringFirstLine[300]; @@ -352,7 +352,7 @@ void InventoryMan::drawPanelScroll(Scroll* scroll) { } } -void InventoryMan::openAndDrawChest(Thing thingToOpen, Container* chest, bool isPressingEye) { +void InventoryMan::openAndDrawChest(Thing thingToOpen, Container *chest, bool isPressingEye) { DisplayMan &dispMan = *_vm->_displayMan; ObjectMan &objMan = *_vm->_objectMan; @@ -393,7 +393,7 @@ void InventoryMan::drawIconToViewport(IconIndice iconIndex, int16 xPos, int16 yP _vm->_displayMan->blitToViewport(iconBitmap, boxIcon, k8_byteWidth, kM1_ColorNoTransparency, 16); } -void InventoryMan::buildObjectAttributeString(int16 potentialAttribMask, int16 actualAttribMask, const char** attribStrings, char* destString, const char* prefixString, const char* suffixString) { +void InventoryMan::buildObjectAttributeString(int16 potentialAttribMask, int16 actualAttribMask, const char **attribStrings, char *destString, const char *prefixString, const char *suffixString) { uint16 identicalBitCount = 0; int16 attribMask = 1; for (uint16 stringIndex = 0; stringIndex < 16; stringIndex++, attribMask <<= 1) { @@ -489,7 +489,7 @@ void InventoryMan::drawPanelObject(Thing thingToDraw, bool pressingEye) { drawPanelObjectDescriptionString("\f"); // form feed ThingType thingType = thingToDraw.getType(); if (thingType == k7_ScrollThingType) - drawPanelScroll((Scroll*)rawThingPtr); + drawPanelScroll((Scroll *)rawThingPtr); else if (thingType == k9_ContainerThingType) openAndDrawChest(thingToDraw, (Container *)rawThingPtr, pressingEye); else { @@ -693,7 +693,7 @@ void InventoryMan::setDungeonViewPalette() { Thing slotThing = curChampion->_slots[slotIndex]; if ((_vm->_objectMan->getObjectType(slotThing) >= k4_IconIndiceWeaponTorchUnlit) && (_vm->_objectMan->getObjectType(slotThing) <= k7_IconIndiceWeaponTorchLit)) { - Weapon *curWeapon = (Weapon*)_vm->_dungeonMan->getThingData(slotThing); + Weapon *curWeapon = (Weapon *)_vm->_dungeonMan->getThingData(slotThing); *curTorchLightPower = curWeapon->getChargeCount(); } else { *curTorchLightPower = 0; @@ -779,9 +779,9 @@ void InventoryMan::decreaseTorchesLightPower() { } void InventoryMan::drawChampionSkillsAndStatistics() { - static const char* statisticNamesEN[7] = {"L", "STRENGTH", "DEXTERITY", "WISDOM", "VITALITY", "ANTI-MAGIC", "ANTI-FIRE"}; - static const char* statisticNamesDE[7] = {"L", "STAERKE", "FLINKHEIT", "WEISHEIT", "VITALITAET", "ANTI-MAGIE", "ANTI-FEUER"}; - static const char* statisticNamesFR[7] = {"L", "FORCE", "DEXTERITE", "SAGESSE", "VITALITE", "ANTI-MAGIE", "ANTI-FEU"}; + static const char *statisticNamesEN[7] = {"L", "STRENGTH", "DEXTERITY", "WISDOM", "VITALITY", "ANTI-MAGIC", "ANTI-FIRE"}; + static const char *statisticNamesDE[7] = {"L", "STAERKE", "FLINKHEIT", "WEISHEIT", "VITALITAET", "ANTI-MAGIE", "ANTI-FEUER"}; + static const char *statisticNamesFR[7] = {"L", "FORCE", "DEXTERITE", "SAGESSE", "VITALITE", "ANTI-MAGIE", "ANTI-FEU"}; const char **statisticNames; @@ -872,14 +872,15 @@ void InventoryMan::clickOnMouth() { 550, /* Screamer Slice */ 350, /* Worm round */ 990, /* Drumstick / Shank */ - 1400}; /* Dragon steak */ + 1400 /* Dragon steak */ + }; Thing L1078_T_Thing; uint16 L1079_ui_IconIndex; uint16 L1080_ui_ChampionIndex; bool L1081_B_RemoveObjectFromLeaderHand; - Junk* L1082_ps_Junk; - Champion* L1083_ps_Champion; + Junk *L1082_ps_Junk; + Champion *L1083_ps_Champion; TimelineEvent L1084_s_Event; uint16 L1085_ui_Multiple; #define AL1085_ui_PotionPower L1085_ui_Multiple @@ -925,7 +926,7 @@ void InventoryMan::clickOnMouth() { L1089_ui_Weight = _vm->_dungeonMan->getObjectWeight(L1078_T_Thing); L1080_ui_ChampionIndex = _vm->ordinalToIndex(_inventoryChampionOrdinal); L1083_ps_Champion = &_vm->_championMan->_champions[L1080_ui_ChampionIndex]; - L1082_ps_Junk = (Junk*)_vm->_dungeonMan->getThingData(L1078_T_Thing); + L1082_ps_Junk = (Junk *)_vm->_dungeonMan->getThingData(L1078_T_Thing); if ((L1079_ui_IconIndex >= k8_IconIndiceJunkWater) && (L1079_ui_IconIndex <= k9_IconIndiceJunkWaterSkin)) { if (!(L1082_ps_Junk->getChargeCount())) { return; @@ -946,15 +947,15 @@ void InventoryMan::clickOnMouth() { _vm->_championMan->getObjectRemovedFromLeaderHand(); } if (AL1088_ui_ThingType == k8_PotionThingType) { - AL1085_ui_PotionPower = ((Potion*)L1082_ps_Junk)->getPower(); + AL1085_ui_PotionPower = ((Potion *)L1082_ps_Junk)->getPower(); L1086_ui_Counter = ((511 - AL1085_ui_PotionPower) / (32 + (AL1085_ui_PotionPower + 1) / 8)) >> 1; AL1085_ui_AdjustedPotionPower = (AL1085_ui_PotionPower / 25) + 8; /* Value between 8 and 18 */ - switch (((Potion*)L1082_ps_Junk)->getType()) { + switch (((Potion *)L1082_ps_Junk)->getType()) { case k6_PotionTypeRos: adjustStatisticCurrentValue(L1083_ps_Champion, k2_ChampionStatDexterity, AL1085_ui_AdjustedPotionPower); break; case k7_PotionTypeKu: - adjustStatisticCurrentValue(L1083_ps_Champion, k1_ChampionStatStrength, (((Potion*)L1082_ps_Junk)->getPower() / 35) + 5); /* Value between 5 and 12 */ + adjustStatisticCurrentValue(L1083_ps_Champion, k1_ChampionStatStrength, (((Potion *)L1082_ps_Junk)->getPower() / 35) + 5); /* Value between 5 and 12 */ break; case k8_PotionTypeDane: adjustStatisticCurrentValue(L1083_ps_Champion, k3_ChampionStatWisdom, AL1085_ui_AdjustedPotionPower); @@ -989,7 +990,7 @@ void InventoryMan::clickOnMouth() { L1083_ps_Champion->_currMana = AL1088_ui_Mana; break; case k14_PotionTypeVi: - AL1088_ui_HealWoundIterationCount = MAX(1, (((Potion*)L1082_ps_Junk)->getPower() / 42)); + AL1088_ui_HealWoundIterationCount = MAX(1, (((Potion *)L1082_ps_Junk)->getPower() / 42)); L1083_ps_Champion->_currHealth += L1083_ps_Champion->_maxHealth / L1086_ui_Counter; L1087_i_Wounds = L1083_ps_Champion->_wounds; if (L1087_i_Wounds) { /* If the champion is wounded */ @@ -1009,7 +1010,7 @@ void InventoryMan::clickOnMouth() { default: break; } - ((Potion*)L1082_ps_Junk)->setType(k20_PotionTypeEmptyFlask); + ((Potion *)L1082_ps_Junk)->setType(k20_PotionTypeEmptyFlask); } else if ((L1079_ui_IconIndex >= k168_IconIndiceJunkApple) && (L1079_ui_IconIndex < k176_IconIndiceJunkIronKey)) { L1083_ps_Champion->_food = MIN(L1083_ps_Champion->_food + G0242_ai_Graphic559_FoodAmounts[L1079_ui_IconIndex - k168_IconIndiceJunkApple], 2048); } @@ -1042,7 +1043,7 @@ void InventoryMan::clickOnMouth() { _vm->_eventMan->hideMouse(); } -void InventoryMan::adjustStatisticCurrentValue(Champion* champ, uint16 statIndex, int16 valueDelta) { +void InventoryMan::adjustStatisticCurrentValue(Champion *champ, uint16 statIndex, int16 valueDelta) { int16 L1077_i_Multiple; #define AL1077_i_CurrentValue L1077_i_Multiple #define AL1077_i_Delta L1077_i_Multiple diff --git a/engines/dm/loadsave.cpp b/engines/dm/loadsave.cpp index a9ee6f8d0a..ef3ed34369 100644 --- a/engines/dm/loadsave.cpp +++ b/engines/dm/loadsave.cpp @@ -257,7 +257,7 @@ Common::String DMEngine::getSavefileName(uint16 slot) { #define SAVEGAME_ID MKTAG('D', 'M', 'D', 'M') #define SAVEGAME_VERSION 1 -void DMEngine::writeSaveGameHeader(Common::OutSaveFile* out, const Common::String& saveName) { +void DMEngine::writeSaveGameHeader(Common::OutSaveFile *out, const Common::String& saveName) { out->writeUint32BE(SAVEGAME_ID); // Write version @@ -405,7 +405,7 @@ bool DMEngine::writeCompleteSaveFile(int16 saveSlot, Common::String& saveDescrip return true; } -bool readSaveGameHeader(Common::InSaveFile* in, SaveGameHeader* header) { +bool readSaveGameHeader(Common::InSaveFile *in, SaveGameHeader *header) { uint32 id = in->readUint32BE(); // Check if it's a valid ScummVM savegame diff --git a/engines/dm/lzw.h b/engines/dm/lzw.h index 3603423718..313b74b6d8 100644 --- a/engines/dm/lzw.h +++ b/engines/dm/lzw.h @@ -51,7 +51,7 @@ class LZWdecompressor { int16 _inputBufferBitCount; int16 _charToRepeat; - byte* _tempBuffer; + byte *_tempBuffer; int16 *_prefixCode; byte *_appendCharacter; diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp index 687e619661..f0f7930795 100644 --- a/engines/dm/menus.cpp +++ b/engines/dm/menus.cpp @@ -87,7 +87,7 @@ void MenuMan::initConstants() { 16, /* SPIT */ 14, /* BRANDISH */ 10, /* THROW */ - 3 /* FUSE */ + 3 /* FUSE */ }; _boxActionArea1ActionMenu = Box(224, 319, 77, 97); // @ G0501_s_Graphic560_Box_ActionArea1ActionMenu @@ -282,7 +282,7 @@ void MenuMan::drawActionArea() { _refreshActionArea = false; } -const char* MenuMan::getActionName(ChampionAction actionIndex) { +const char *MenuMan::getActionName(ChampionAction actionIndex) { const char *g490_ChampionActionNames[44] = { // @ G0490_ac_Graphic560_ActionNames "N", "BLOCK", "CHOP", "X", "BLOW HORN", "FLIP", "PUNCH", "KICK", "WAR CRY", "STAB", "CLIMB DOWN", "FREEZE LIFE", @@ -399,7 +399,7 @@ void MenuMan::setMagicCasterAndDrawSpellArea(int16 champIndex) { static Box boxSpellAreaLine2(224, 319, 50, 61); // @ K0075_s_Box_SpellAreaLine2 static Box boxSpellAreaLine3(224, 319, 62, 73); // @ K0076_s_Box_SpellAreaLine3 - Champion* L1213_ps_Champion; + Champion *L1213_ps_Champion; if ((champIndex == _vm->_championMan->_magicCasterChampionIndex) || ((champIndex != kM1_ChampionNone) && !_vm->_championMan->_champions[champIndex]._currHealth)) { return; @@ -458,7 +458,7 @@ void MenuMan::drawEnabledMenus() { int16 MenuMan::getClickOnSpellCastResult() { int16 L1259_i_SpellCastResult; - Champion* L1260_ps_Champion; + Champion *L1260_ps_Champion; L1260_ps_Champion = &_vm->_championMan->_champions[_vm->_championMan->_magicCasterChampionIndex]; @@ -486,14 +486,14 @@ int16 MenuMan::getChampionSpellCastResult(uint16 champIndex) { #define AL1269_ui_RequiredSkillLevel L1269_ui_Multiple #define AL1269_ui_EmptyFlaskWeight L1269_ui_Multiple #define AL1269_ui_Ticks L1269_ui_Multiple - Champion* L1270_ps_Champion; - Spell* L1271_ps_Spell; + Champion *L1270_ps_Champion; + Spell *L1271_ps_Spell; Thing L1272_T_Object; uint16 L1273_ui_Experience; int16 L1274_i_MissingSkillLevelCount; - Potion* L1275_ps_Potion; + Potion *L1275_ps_Potion; TimelineEvent L1276_s_Event; - Junk* L1277_ps_Junk; + Junk *L1277_ps_Junk; if (champIndex >= _vm->_championMan->_partyChampionCount) { @@ -607,7 +607,7 @@ T0412033: case k7_spellType_otherZokathra: if ((L1272_T_Object = _vm->_dungeonMan->getUnusedThing(k10_JunkThingType)) == Thing::_none) break; - L1277_ps_Junk = (Junk*)_vm->_dungeonMan->getThingData(L1272_T_Object); + L1277_ps_Junk = (Junk *)_vm->_dungeonMan->getThingData(L1272_T_Object); L1277_ps_Junk->setType(k51_JunkTypeZokathra); ChampionSlot AL1267_ui_SlotIndex; if (L1270_ps_Champion->_slots[k0_ChampionSlotReadyHand] == Thing::_none) { @@ -635,7 +635,7 @@ T0412033: return k1_spellCastSuccess; } -Spell* MenuMan::getSpellFromSymbols(byte* symbols) { +Spell *MenuMan::getSpellFromSymbols(byte *symbols) { static Spell G0487_as_Graphic560_Spells[25] = { /* { Symbols, BaseRequiredSkillLevel, SkillIndex, Attributes } */ Spell(0x00666F00, 2, 15, 0x7843), @@ -689,7 +689,7 @@ Spell* MenuMan::getSpellFromSymbols(byte* symbols) { return NULL; } -void MenuMan::menusPrintSpellFailureMessage(Champion* champ, uint16 failureType, uint16 skillIndex) { +void MenuMan::menusPrintSpellFailureMessage(Champion *champ, uint16 failureType, uint16 skillIndex) { const char *L1264_pc_Message = nullptr; if (skillIndex > k3_ChampionSkillWizard) @@ -734,14 +734,14 @@ void MenuMan::menusPrintSpellFailureMessage(Champion* champ, uint16 failureType, _vm->_textMan->printMessage(k4_ColorCyan, L1264_pc_Message); } -Potion* MenuMan::getEmptyFlaskInHand(Champion* champ, Thing* potionThing) { +Potion *MenuMan::getEmptyFlaskInHand(Champion *champ, Thing *potionThing) { Thing L1265_T_Thing; int16 L1266_i_SlotIndex; for (L1266_i_SlotIndex = k2_ChampionSlotHead; --L1266_i_SlotIndex >= k0_ChampionSlotReadyHand; ) { if (((L1265_T_Thing = champ->_slots[L1266_i_SlotIndex]) != Thing::_none) && (_vm->_objectMan->getIconIndex(L1265_T_Thing) == k195_IconIndicePotionEmptyFlask)) { *potionThing = L1265_T_Thing; - return (Potion*)_vm->_dungeonMan->getThingData(L1265_T_Thing); + return (Potion *)_vm->_dungeonMan->getThingData(L1265_T_Thing); } } return nullptr; @@ -758,7 +758,7 @@ void MenuMan::createEvent70_light(int16 lightPower, int16 ticks) { _vm->_inventoryMan->setDungeonViewPalette(); } -bool MenuMan::isPartySpellOrFireShieldSuccessful(Champion* champ, bool spellShield, uint16 ticks, bool useMana) { +bool MenuMan::isPartySpellOrFireShieldSuccessful(Champion *champ, bool spellShield, uint16 ticks, bool useMana) { bool L1239_B_IsPartySpellOrFireShieldSuccessful; TimelineEvent L1240_s_Event; @@ -812,7 +812,7 @@ void MenuMan::drawAvailableSymbols(uint16 symbolStep) { } } -void MenuMan::drawChampionSymbols(Champion* champ) { +void MenuMan::drawChampionSymbols(Champion *champ) { uint16 L1218_ui_SymbolIndex; int16 L1219_i_X; uint16 L1220_ui_SymbolCount; @@ -886,8 +886,7 @@ bool MenuMan::didClickTriggerAction(int16 actionListIndex) { uint16 L1196_ui_ChampionIndex; uint16 L1197_ui_ActionIndex; bool L1198_B_ClickTriggeredAction; - Champion* L1199_ps_Champion; - + Champion *L1199_ps_Champion; if (!_vm->_championMan->_actingChampionOrdinal || (actionListIndex != -1 && (_actionList._actionIndices[actionListIndex] == k255_ChampionActionNone))) return false; @@ -953,7 +952,8 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { 22, /* SPIT */ 10, /* BRANDISH */ 0, /* THROW */ - 2}; /* FUSE */ + 2 /* FUSE */ + }; static unsigned char G0494_auc_Graphic560_ActionStamina[44] = { 0, /* N */ 4, /* BLOCK */ @@ -998,7 +998,8 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { 3, /* SPIT */ 2, /* BRANDISH */ 0, /* THROW */ - 2}; /* FUSE */ + 2 /* FUSE */ + }; static unsigned char G0497_auc_Graphic560_ActionExperienceGain[44] = { 0, /* N */ 8, /* BLOCK */ @@ -1043,7 +1044,8 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { 25, /* SPIT */ 0, /* BRANDISH */ 5, /* THROW */ - 1}; /* FUSE */ + 1 /* FUSE */ + }; uint16 L1244_ui_Multiple; #define AL1244_ui_TargetSquare L1244_ui_Multiple #define AL1244_ui_HealingAmount L1244_ui_Multiple @@ -1070,8 +1072,8 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { int16 L1253_i_ActionStamina; int16 L1254_i_ActionSkillIndex; int16 L1255_i_ActionExperienceGain; - WeaponInfo* L1256_ps_WeaponInfoActionHand; - WeaponInfo* L1257_ps_WeaponInfoReadyHand; + WeaponInfo *L1256_ps_WeaponInfoActionHand; + WeaponInfo *L1257_ps_WeaponInfoReadyHand; TimelineEvent L1258_s_Event; @@ -1079,7 +1081,7 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) { return false; } L1247_ps_Champion = &_vm->_championMan->_champions[champIndex]; - L1248_ps_Weapon = (Weapon*)_vm->_dungeonMan->getThingData(L1247_ps_Champion->_slots[k1_ChampionSlotActionHand]); + L1248_ps_Weapon = (Weapon *)_vm->_dungeonMan->getThingData(L1247_ps_Champion->_slots[k1_ChampionSlotActionHand]); if (!L1247_ps_Champion->_currHealth) { return false; } @@ -1335,27 +1337,27 @@ T0407076: return AL1245_B_ActionPerformed; } -void MenuMan::setChampionDirectionToPartyDirection(Champion* champ) { +void MenuMan::setChampionDirectionToPartyDirection(Champion *champ) { if (champ->_dir != _vm->_dungeonMan->_partyDir) { champ->_dir = _vm->_dungeonMan->_partyDir; setFlag(champ->_attributes, k0x0400_ChampionAttributeIcon); } } -void MenuMan::decrementCharges(Champion* champ) { +void MenuMan::decrementCharges(Champion *champ) { Thing L1242_T_Thing; - Junk* L1243_ps_Junk; + Junk *L1243_ps_Junk; - L1243_ps_Junk = (Junk*)_vm->_dungeonMan->getThingData(L1242_T_Thing = champ->_slots[k1_ChampionSlotActionHand]); + L1243_ps_Junk = (Junk *)_vm->_dungeonMan->getThingData(L1242_T_Thing = champ->_slots[k1_ChampionSlotActionHand]); switch (L1242_T_Thing.getType()) { case k5_WeaponThingType: - if (((Weapon*)L1243_ps_Junk)->getChargeCount()) { - ((Weapon*)L1243_ps_Junk)->setChargeCount(((Weapon*)L1243_ps_Junk)->getChargeCount() - 1); + if (((Weapon *)L1243_ps_Junk)->getChargeCount()) { + ((Weapon *)L1243_ps_Junk)->setChargeCount(((Weapon *)L1243_ps_Junk)->getChargeCount() - 1); } break; case k6_ArmourThingType: - if (((Armour*)L1243_ps_Junk)->getChargeCount()) { - ((Armour*)L1243_ps_Junk)->setChargeCount(((Armour*)L1243_ps_Junk)->getChargeCount() - 1); + if (((Armour *)L1243_ps_Junk)->getChargeCount()) { + ((Armour *)L1243_ps_Junk)->setChargeCount(((Armour *)L1243_ps_Junk)->getChargeCount() - 1); } break; case k10_JunkThingType: @@ -1369,7 +1371,7 @@ void MenuMan::decrementCharges(Champion* champ) { _vm->_championMan->drawChangedObjectIcons(); } -bool MenuMan::isMeleeActionPerformed(int16 champIndex, Champion* champ, int16 actionIndex, int16 targetMapX, int16 targetMapY, int16 skillIndex) { +bool MenuMan::isMeleeActionPerformed(int16 champIndex, Champion *champ, int16 actionIndex, int16 targetMapX, int16 targetMapY, int16 skillIndex) { static unsigned char G0492_auc_Graphic560_ActionDamageFactor[44] = { 0, /* N */ 15, /* BLOCK */ @@ -1414,7 +1416,8 @@ bool MenuMan::isMeleeActionPerformed(int16 champIndex, Champion* champ, int16 ac 0, /* SPIT */ 0, /* BRANDISH */ 0, /* THROW */ - 0}; /* FUSE */ + 0 /* FUSE */ + }; static unsigned char G0493_auc_Graphic560_ActionHitProbability[44] = { 0, /* N */ 22, /* BLOCK */ @@ -1459,7 +1462,8 @@ bool MenuMan::isMeleeActionPerformed(int16 champIndex, Champion* champ, int16 ac 0, /* SPIT */ 0, /* BRANDISH */ 0, /* THROW */ - 0}; /* FUSE */ + 0 /* FUSE */ + }; uint16 L1236_ui_Multiple; #define AL1236_ui_ChampionCell L1236_ui_Multiple @@ -1494,7 +1498,7 @@ T0402005: /* Check if there is another champion in front */ if ((_vm->_objectMan->getIconIndex(champ->_slots[k1_ChampionSlotActionHand]) == k40_IconIndiceWeaponVorpalBlade) || (actionIndex == k24_ChampionActionDisrupt)) { setFlag(AL1237_ui_ActionHitProbability, k0x8000_hitNonMaterialCreatures); } - _actionDamage = _vm->_groupMan->getMeleeActionDamage(champ, champIndex, (Group*)_vm->_dungeonMan->getThingData(_actionTargetGroupThing), _vm->ordinalToIndex(L1238_i_CreatureOrdinal), targetMapX, targetMapY, AL1237_ui_ActionHitProbability, AL1236_ui_ActionDamageFactor, skillIndex); + _actionDamage = _vm->_groupMan->getMeleeActionDamage(champ, champIndex, (Group *)_vm->_dungeonMan->getThingData(_actionTargetGroupThing), _vm->ordinalToIndex(L1238_i_CreatureOrdinal), targetMapX, targetMapY, AL1237_ui_ActionHitProbability, AL1236_ui_ActionDamageFactor, skillIndex); return true; } T0402010: @@ -1506,9 +1510,9 @@ bool MenuMan::isGroupFrightenedByAction(int16 champIndex, uint16 actionIndex, in uint16 L1230_ui_FearResistance; uint16 L1231_ui_Experience = 0; bool L1232_B_IsGroupFrightenedByAction; - Group* L1233_ps_Group; - CreatureInfo* L1234_ps_CreatureInfo; - ActiveGroup* L1235_ps_ActiveGroup; + Group *L1233_ps_Group; + CreatureInfo *L1234_ps_CreatureInfo; + ActiveGroup *L1235_ps_ActiveGroup; L1232_B_IsGroupFrightenedByAction = false; @@ -1536,7 +1540,7 @@ bool MenuMan::isGroupFrightenedByAction(int16 champIndex, uint16 actionIndex, in L1231_ui_Experience = 45; } L1229_i_FrightAmount += _vm->_championMan->getSkillLevel(champIndex, k14_ChampionSkillInfluence); - L1233_ps_Group = (Group*)_vm->_dungeonMan->getThingData(_actionTargetGroupThing); + L1233_ps_Group = (Group *)_vm->_dungeonMan->getThingData(_actionTargetGroupThing); L1234_ps_CreatureInfo = &_vm->_dungeonMan->_creatureInfos[L1233_ps_Group->_type]; if (((L1230_ui_FearResistance = L1234_ps_CreatureInfo->getFearResistance()) > _vm->getRandomNumber(L1229_i_FrightAmount)) || (L1230_ui_FearResistance == k15_immuneToFear)) { L1231_ui_Experience >>= 1; @@ -1555,9 +1559,9 @@ T0401016: return L1232_B_IsGroupFrightenedByAction; } -void MenuMan::printMessageAfterReplacements(const char* str) { - char* L1164_pc_Character; - char* L1165_pc_ReplacementString; +void MenuMan::printMessageAfterReplacements(const char *str) { + char *L1164_pc_Character; + char *L1165_pc_ReplacementString; char L1166_ac_OutputString[128]; @@ -1633,11 +1637,12 @@ void MenuMan::processCommands116To119_setActingChampion(uint16 champIndex) { ActionSet(42, 9, 255, 0x00, 0x00), ActionSet(1, 12, 255, 0x02, 0x00), ActionSet(42, 255, 255, 0x00, 0x00), - ActionSet(6, 11, 255, 0x80, 0x00)}; + ActionSet(6, 11, 255, 0x80, 0x00) + }; uint16 L1188_ui_ActionSetIndex; Thing L1189_T_Thing; - Champion* L1190_ps_Champion; - ActionSet* L1191_ps_ActionSet; + Champion *L1190_ps_Champion; + ActionSet *L1191_ps_ActionSet; L1190_ps_Champion = &_vm->_championMan->_champions[champIndex]; @@ -1659,7 +1664,7 @@ void MenuMan::processCommands116To119_setActingChampion(uint16 champIndex) { drawActionArea(); } -void MenuMan::setActionList(ActionSet* actionSet) { +void MenuMan::setActionList(ActionSet *actionSet) { #define k0x0080_actionRequiresCharge 0x0080 // @ MASK0x0080_ACTION_REQUIRES_CHARGE @@ -1691,15 +1696,15 @@ void MenuMan::setActionList(ActionSet* actionSet) { int16 MenuMan::getActionObjectChargeCount() { Thing L1167_T_Thing; - Junk* L1168_ps_Junk; + Junk *L1168_ps_Junk; - L1168_ps_Junk = (Junk*)_vm->_dungeonMan->getThingData(L1167_T_Thing = _vm->_championMan->_champions[_vm->ordinalToIndex(_vm->_championMan->_actingChampionOrdinal)]._slots[k1_ChampionSlotActionHand]); + L1168_ps_Junk = (Junk *)_vm->_dungeonMan->getThingData(L1167_T_Thing = _vm->_championMan->_champions[_vm->ordinalToIndex(_vm->_championMan->_actingChampionOrdinal)]._slots[k1_ChampionSlotActionHand]); switch (L1167_T_Thing.getType()) { case k5_WeaponThingType: - return ((Weapon*)L1168_ps_Junk)->getChargeCount(); + return ((Weapon *)L1168_ps_Junk)->getChargeCount(); case k6_ArmourThingType: - return ((Armour*)L1168_ps_Junk)->getChargeCount(); + return ((Armour *)L1168_ps_Junk)->getChargeCount(); case k10_JunkThingType: return L1168_ps_Junk->getChargeCount(); default: @@ -1718,12 +1723,12 @@ void MenuMan::drawActionDamage(int16 damage) { int16 L1176_i_Multiple; #define AL1176_i_X L1176_i_Multiple #define AL1176_i_PixelWidth L1176_i_Multiple - byte* L1177_puc_Bitmap; - unsigned char* L1178_puc_Multiple; + byte *L1177_puc_Bitmap; + unsigned char *L1178_puc_Multiple; #define AL1178_puc_String L1178_puc_Multiple #define AL1178_puc_Bitmap L1178_puc_Multiple char L1179_ac_String[6]; - const Box* L1180_ps_Box; + const Box *L1180_ps_Box; int16 L1643_i_Width; _vm->_eventMan->showMouse(); @@ -1747,10 +1752,10 @@ void MenuMan::drawActionDamage(int16 damage) { if (damage == kM1_damageCantReach) { AL1176_i_X = pos[0]; - AL1178_puc_String = (byte*)message[0]; + AL1178_puc_String = (byte *)message[0]; } else { AL1176_i_X = pos[1]; - AL1178_puc_String = (byte*)message[1]; + AL1178_puc_String = (byte *)message[1]; } _vm->_textMan->printToLogicalScreen(AL1176_i_X, 100, k4_ColorCyan, k0_ColorBlack, (char *)AL1178_puc_String); } else { |