[Scummvm-git-logs] scummvm master -> be12f7a835aa72f7d9a04d9277d3df1b76279ca7
sev-
sev at scummvm.org
Sun Sep 11 23:33:00 CEST 2016
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6172be6ef0 DM: Fix logical error with local variables
3db12da516 JANITORIAL: Remove extra whitespaces
426c3eb0d8 DM: Fix warning
802ec48a3d DM: Fix variable clash
efe44f1eb0 DM: Fix warning
c673c5654b DM: Fix comparison warnings
a48d15c758 DM: Fix variable shadowing warning
be12f7a835 DM: Fix another variable shadowing.
Commit: 6172be6ef015ba54ac846ab82b5145ef53309f6b
https://github.com/scummvm/scummvm/commit/6172be6ef015ba54ac846ab82b5145ef53309f6b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
DM: Fix logical error with local variables
Changed paths:
engines/dm/projexpl.cpp
diff --git a/engines/dm/projexpl.cpp b/engines/dm/projexpl.cpp
index b7b932f..786a3b0 100644
--- a/engines/dm/projexpl.cpp
+++ b/engines/dm/projexpl.cpp
@@ -359,7 +359,7 @@ int16 ProjExpl::projectileGetImpactCount(int16 impactType, int16 mapX, int16 map
if ((impactType == kM1_CreatureElemType) && (_creatureDamageOutcome == k2_outcomeKilledAllCreaturesInGroup))
break;
- Thing curThing = _vm->_dungeonMan->getSquareFirstThing(mapX, mapY);
+ curThing = _vm->_dungeonMan->getSquareFirstThing(mapX, mapY);
} else
curThing = _vm->_dungeonMan->getNextThing(curThing);
}
Commit: 3db12da51654754f9b9a18a276d15a687231cde4
https://github.com/scummvm/scummvm/commit/3db12da51654754f9b9a18a276d15a687231cde4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
JANITORIAL: Remove extra whitespaces
Changed paths:
engines/dm/dungeonman.h
diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h
index a09abb2..152d92f 100644
--- a/engines/dm/dungeonman.h
+++ b/engines/dm/dungeonman.h
@@ -58,7 +58,7 @@ enum ElementType {
kDMElementTypeDoorSide = 16, // @ C16_ELEMENT_DOOR_SIDE /* Values 16-19 are only used for square aspect */
kDMElementTypeDoorFront = 17, // @ C17_ELEMENT_DOOR_FRONT
kDMElementTypeStairsSide = 18, // @ C18_ELEMENT_STAIRS_SIDE
- kDMElementTypeStairsFront = 19 // @ C19_ELEMENT_STAIRS_FRONT
+ kDMElementTypeStairsFront = 19 // @ C19_ELEMENT_STAIRS_FRONT
};
enum ObjectAllowedSlot {
@@ -73,7 +73,7 @@ enum ObjectAllowedSlot {
kDMMaskPouchPassAndThroughDoors = 0x0100, // @ MASK0x0100_POUCH_PASS_AND_THROUGH_DOORS
kDMMaskHands = 0x0200, // @ MASK0x0200_HANDS
kDMMaskContainer = 0x0400, // @ MASK0x0400_CONTAINER
- kDMMaskFootprints = 0x8000 // @ MASK0x8000_FOOTPRINTS
+ kDMMaskFootprints = 0x8000 // @ MASK0x8000_FOOTPRINTS
};
enum ArmourAttribute {
@@ -84,14 +84,14 @@ enum ArmourAttribute {
enum WeaponClass {
kDMWeaponClassNone = -1,
/* Class 0: SWING weapons */
- kDMWeaponClassSwingWeapon = 0, // @ C000_CLASS_SWING_WEAPON
+ kDMWeaponClassSwingWeapon = 0, // @ C000_CLASS_SWING_WEAPON
/* Class 1 to 15: THROW weapons */
- kDMWeaponClassDaggerAndAxes = 2, // @ C002_CLASS_DAGGER_AND_AXES
+ kDMWeaponClassDaggerAndAxes = 2, // @ C002_CLASS_DAGGER_AND_AXES
kDMWeaponClassBowAmmunition = 10, // @ C010_CLASS_BOW_AMMUNITION
kDMWeaponClassSlingAmmunition = 11, // @ C011_CLASS_SLING_AMMUNITION
kDMWeaponClassPoisinDart = 12, // @ C012_CLASS_POISON_DART
/* Class 16 to 111: SHOOT weapons */
- kDMWeaponClassFirstBow = 16, // @ C016_CLASS_FIRST_BOW
+ kDMWeaponClassFirstBow = 16, // @ C016_CLASS_FIRST_BOW
kDMWeaponClassLastBow = 31, // @ C031_CLASS_LAST_BOW
kDMWeaponClassFirstSling = 32, // @ C032_CLASS_FIRST_SLING
kDMWeaponClassLastSling = 47, // @ C047_CLASS_LAST_SLING
@@ -101,29 +101,29 @@ enum WeaponClass {
enum TextType {
/* Used for text on walls */
- kDMTextTypeInscription = 0, // @ C0_TEXT_TYPE_INSCRIPTION
+ kDMTextTypeInscription = 0, // @ C0_TEXT_TYPE_INSCRIPTION
/* Used for messages displayed when the party walks on a square */
- kDMTextTypeMessage = 1, // @ C1_TEXT_TYPE_MESSAGE
+ kDMTextTypeMessage = 1, // @ C1_TEXT_TYPE_MESSAGE
/* Used for text on scrolls and champion information */
- kDMTextTypeScroll = 2 // @ C2_TEXT_TYPE_SCROLL
+ kDMTextTypeScroll = 2 // @ C2_TEXT_TYPE_SCROLL
};
enum SquareAspect {
kDMSquareAspectElement = 0, // @ C0_ELEMENT
- kDMSquareAspectFirstGroupOrObject = 1, // @ C1_FIRST_GROUP_OR_OBJECT
- kDMSquareAspectRightWallOrnOrd = 2, // @ C2_RIGHT_WALL_ORNAMENT_ORDINAL
- kDMSquareFrontWallOrnOrd = 3, // @ C3_FRONT_WALL_ORNAMENT_ORDINAL
- kDMSquareAspectLeftWallOrnOrd = 4, // @ C4_LEFT_WALL_ORNAMENT_ORDINAL
- kDMSquareAspectPitInvisible = 2, // @ C2_PIT_INVISIBLE
- kDMSquareAspectTeleporterVisible = 2, // @ C2_TELEPORTER_VISIBLE
- kDMSquareAspectStairsUp = 2, // @ C2_STAIRS_UP
- kDMSquareAspectDoorState = 2, // @ C2_DOOR_STATE
- kDMSquareAspectDoorThingIndex = 3, // @ C3_DOOR_THING_INDEX
+ kDMSquareAspectFirstGroupOrObject = 1, // @ C1_FIRST_GROUP_OR_OBJECT
+ kDMSquareAspectRightWallOrnOrd = 2, // @ C2_RIGHT_WALL_ORNAMENT_ORDINAL
+ kDMSquareFrontWallOrnOrd = 3, // @ C3_FRONT_WALL_ORNAMENT_ORDINAL
+ kDMSquareAspectLeftWallOrnOrd = 4, // @ C4_LEFT_WALL_ORNAMENT_ORDINAL
+ kDMSquareAspectPitInvisible = 2, // @ C2_PIT_INVISIBLE
+ kDMSquareAspectTeleporterVisible = 2, // @ C2_TELEPORTER_VISIBLE
+ kDMSquareAspectStairsUp = 2, // @ C2_STAIRS_UP
+ kDMSquareAspectDoorState = 2, // @ C2_DOOR_STATE
+ kDMSquareAspectDoorThingIndex = 3, // @ C3_DOOR_THING_INDEX
kDMSquareAspectFloorOrn = 4, // @ C4_FLOOR_ORNAMENT_ORDINAL
};
-#define k15_immuneToFire 15 // @ C15_IMMUNE_TO_FIRE
-#define k15_immuneToPoison 15 // @ C15_IMMUNE_TO_POISON
+#define k15_immuneToFire 15 // @ C15_IMMUNE_TO_FIRE
+#define k15_immuneToPoison 15 // @ C15_IMMUNE_TO_POISON
enum TeleporterScope {
k0x0001_TelepScopeCreatures = 1, // @ MASK0x0001_SCOPE_CREATURES
@@ -171,7 +171,7 @@ enum SensorType {
k127_SensorWallChampionPortrait = 127 // @ C127_SENSOR_WALL_CHAMPION_PORTRAIT /* Triggered by player click F0275_SENSOR_IsTriggeredByClickOnWall */
};
-#define k0x8000_randomDrop 0x8000 // @ MASK0x8000_RANDOM_DROP
+#define k0x8000_randomDrop 0x8000 // @ MASK0x8000_RANDOM_DROP
enum WeaponType {
k2_WeaponTypeTorch = 2, // @ C02_WEAPON_TORCH
@@ -224,62 +224,62 @@ enum JunkType {
k51_JunkTypeZokathra = 51 // @ C51_JUNK_ZOKATHRA,
};
-#define kM1_soundModeDoNotPlaySound -1 // @ CM1_MODE_DO_NOT_PLAY_SOUND
-#define k0_soundModePlayImmediately 0 // @ C00_MODE_PLAY_IMMEDIATELY
-#define k1_soundModePlayIfPrioritized 1 // @ C01_MODE_PLAY_IF_PRIORITIZED
-#define k2_soundModePlayOneTickLater 2 // @ C02_MODE_PLAY_ONE_TICK_LATER
-
-#define k0_ExplosionType_Fireball 0 // @ C000_EXPLOSION_FIREBALL
-#define k1_ExplosionType_Slime 1 // @ C001_EXPLOSION_SLIME
-#define k2_ExplosionType_LightningBolt 2 // @ C002_EXPLOSION_LIGHTNING_BOLT
-#define k3_ExplosionType_HarmNonMaterial 3 // @ C003_EXPLOSION_HARM_NON_MATERIAL
-#define k4_ExplosionType_OpenDoor 4 // @ C004_EXPLOSION_OPEN_DOOR
-#define k6_ExplosionType_PoisonBolt 6 // @ C006_EXPLOSION_POISON_BOLT
-#define k7_ExplosionType_PoisonCloud 7 // @ C007_EXPLOSION_POISON_CLOUD
-#define k40_ExplosionType_Smoke 40 // @ C040_EXPLOSION_SMOKE
-#define k50_ExplosionType_Fluxcage 50 // @ C050_EXPLOSION_FLUXCAGE
-#define k100_ExplosionType_RebirthStep1 100 // @ C100_EXPLOSION_REBIRTH_STEP1
-#define k101_ExplosionType_RebirthStep2 101 // @ C101_EXPLOSION_REBIRTH_STEP2
+#define kM1_soundModeDoNotPlaySound -1 // @ CM1_MODE_DO_NOT_PLAY_SOUND
+#define k0_soundModePlayImmediately 0 // @ C00_MODE_PLAY_IMMEDIATELY
+#define k1_soundModePlayIfPrioritized 1 // @ C01_MODE_PLAY_IF_PRIORITIZED
+#define k2_soundModePlayOneTickLater 2 // @ C02_MODE_PLAY_ONE_TICK_LATER
+
+#define k0_ExplosionType_Fireball 0 // @ C000_EXPLOSION_FIREBALL
+#define k1_ExplosionType_Slime 1 // @ C001_EXPLOSION_SLIME
+#define k2_ExplosionType_LightningBolt 2 // @ C002_EXPLOSION_LIGHTNING_BOLT
+#define k3_ExplosionType_HarmNonMaterial 3 // @ C003_EXPLOSION_HARM_NON_MATERIAL
+#define k4_ExplosionType_OpenDoor 4 // @ C004_EXPLOSION_OPEN_DOOR
+#define k6_ExplosionType_PoisonBolt 6 // @ C006_EXPLOSION_POISON_BOLT
+#define k7_ExplosionType_PoisonCloud 7 // @ C007_EXPLOSION_POISON_CLOUD
+#define k40_ExplosionType_Smoke 40 // @ C040_EXPLOSION_SMOKE
+#define k50_ExplosionType_Fluxcage 50 // @ C050_EXPLOSION_FLUXCAGE
+#define k100_ExplosionType_RebirthStep1 100 // @ C100_EXPLOSION_REBIRTH_STEP1
+#define k101_ExplosionType_RebirthStep2 101 // @ C101_EXPLOSION_REBIRTH_STEP2
enum SquareMask {
- k0x0001_WallWestRandOrnAllowed = 0x1, // @ MASK0x0001_WALL_WEST_RANDOM_ORNAMENT_ALLOWED
- k0x0002_WallSouthRandOrnAllowed = 0x2, // @ MASK0x0002_WALL_SOUTH_RANDOM_ORNAMENT_ALLOWED
- k0x0004_WallEastRandOrnAllowed = 0x4, // @ MASK0x0004_WALL_EAST_RANDOM_ORNAMENT_ALLOWED
- k0x0008_WallNorthRandOrnAllowed = 0x8, // @ MASK0x0008_WALL_NORTH_RANDOM_ORNAMENT_ALLOWED
- k0x0008_CorridorRandOrnAllowed = 0x8, // @ MASK0x0008_CORRIDOR_RANDOM_ORNAMENT_ALLOWED
- k0x0001_PitImaginary = 0x1, // @ MASK0x0001_PIT_IMAGINARY
- k0x0004_PitInvisible = 0x4, // @ MASK0x0004_PIT_INVISIBLE
- k0x0008_PitOpen = 0x8, // @ MASK0x0008_PIT_OPEN
- k0x0004_StairsUp = 0x4, // @ MASK0x0004_STAIRS_UP
- k0x0008_StairsNorthSouthOrient = 0x8, // @ MASK0x0008_STAIRS_NORTH_SOUTH_ORIENTATION
- k0x0008_DoorNorthSouthOrient = 0x8, // @ MASK0x0008_DOOR_NORTH_SOUTH_ORIENTATION
- k0x0004_TeleporterVisible = 0x4, // @ MASK0x0004_TELEPORTER_VISIBLE
- k0x0008_TeleporterOpen = 0x8, // @ MASK0x0008_TELEPORTER_OPEN
- k0x0001_FakeWallImaginary = 0x1, // @ MASK0x0001_FAKEWALL_IMAGINARY
- k0x0004_FakeWallOpen = 0x4, // @ MASK0x0004_FAKEWALL_OPEN
- k0x0008_FakeWallRandOrnOrFootPAllowed = 0x8, // @ MASK0x0008_FAKEWALL_RANDOM_ORNAMENT_OR_FOOTPRINTS_ALLOWED
- k0x0010_ThingListPresent = 0x10, // @ MASK0x0010_THING_LIST_PRESENT
- k0x8000_DecodeEvenIfInvisible = 0x8000 // @ MASK0x8000_DECODE_EVEN_IF_INVISIBLE
+ k0x0001_WallWestRandOrnAllowed = 0x1, // @ MASK0x0001_WALL_WEST_RANDOM_ORNAMENT_ALLOWED
+ k0x0002_WallSouthRandOrnAllowed = 0x2, // @ MASK0x0002_WALL_SOUTH_RANDOM_ORNAMENT_ALLOWED
+ k0x0004_WallEastRandOrnAllowed = 0x4, // @ MASK0x0004_WALL_EAST_RANDOM_ORNAMENT_ALLOWED
+ k0x0008_WallNorthRandOrnAllowed = 0x8, // @ MASK0x0008_WALL_NORTH_RANDOM_ORNAMENT_ALLOWED
+ k0x0008_CorridorRandOrnAllowed = 0x8, // @ MASK0x0008_CORRIDOR_RANDOM_ORNAMENT_ALLOWED
+ k0x0001_PitImaginary = 0x1, // @ MASK0x0001_PIT_IMAGINARY
+ k0x0004_PitInvisible = 0x4, // @ MASK0x0004_PIT_INVISIBLE
+ k0x0008_PitOpen = 0x8, // @ MASK0x0008_PIT_OPEN
+ k0x0004_StairsUp = 0x4, // @ MASK0x0004_STAIRS_UP
+ k0x0008_StairsNorthSouthOrient = 0x8, // @ MASK0x0008_STAIRS_NORTH_SOUTH_ORIENTATION
+ k0x0008_DoorNorthSouthOrient = 0x8, // @ MASK0x0008_DOOR_NORTH_SOUTH_ORIENTATION
+ k0x0004_TeleporterVisible = 0x4, // @ MASK0x0004_TELEPORTER_VISIBLE
+ k0x0008_TeleporterOpen = 0x8, // @ MASK0x0008_TELEPORTER_OPEN
+ k0x0001_FakeWallImaginary = 0x1, // @ MASK0x0001_FAKEWALL_IMAGINARY
+ k0x0004_FakeWallOpen = 0x4, // @ MASK0x0004_FAKEWALL_OPEN
+ k0x0008_FakeWallRandOrnOrFootPAllowed = 0x8, // @ MASK0x0008_FAKEWALL_RANDOM_ORNAMENT_OR_FOOTPRINTS_ALLOWED
+ k0x0010_ThingListPresent = 0x10, // @ MASK0x0010_THING_LIST_PRESENT
+ k0x8000_DecodeEvenIfInvisible = 0x8000 // @ MASK0x8000_DECODE_EVEN_IF_INVISIBLE
};
enum SquareType {
- kM2_ChampionElemType = -2, // @ CM2_ELEMENT_CHAMPION
- kM1_CreatureElemType = -1, // @ CM1_ELEMENT_CREATURE
- k0_WallElemType = 0, // @ C00_ELEMENT_WALL
- k1_CorridorElemType = 1, // @ C01_ELEMENT_CORRIDOR
- k2_PitElemType = 2, // @ C02_ELEMENT_PIT
- k3_StairsElemType = 3, // @ C03_ELEMENT_STAIRS
- k4_DoorElemType = 4, // @ C04_ELEMENT_DOOR
- k5_TeleporterElemType = 5, // @ C05_ELEMENT_TELEPORTER
- k6_FakeWallElemType = 6, // @ C06_ELEMENT_FAKEWALL
- k16_DoorSideElemType = 16, // @ C16_ELEMENT_DOOR_SIDE
- k17_DoorFrontElemType = 17, // @ C17_ELEMENT_DOOR_FRONT
- k18_StairsSideElemType = 18, // @ C18_ELEMENT_STAIRS_SIDE
- k19_StairsFrontElemType = 19 // @ C19_ELEMENT_STAIRS_FRONT
+ kM2_ChampionElemType = -2, // @ CM2_ELEMENT_CHAMPION
+ kM1_CreatureElemType = -1, // @ CM1_ELEMENT_CREATURE
+ k0_WallElemType = 0, // @ C00_ELEMENT_WALL
+ k1_CorridorElemType = 1, // @ C01_ELEMENT_CORRIDOR
+ k2_PitElemType = 2, // @ C02_ELEMENT_PIT
+ k3_StairsElemType = 3, // @ C03_ELEMENT_STAIRS
+ k4_DoorElemType = 4, // @ C04_ELEMENT_DOOR
+ k5_TeleporterElemType = 5, // @ C05_ELEMENT_TELEPORTER
+ k6_FakeWallElemType = 6, // @ C06_ELEMENT_FAKEWALL
+ k16_DoorSideElemType = 16, // @ C16_ELEMENT_DOOR_SIDE
+ k17_DoorFrontElemType = 17, // @ C17_ELEMENT_DOOR_FRONT
+ k18_StairsSideElemType = 18, // @ C18_ELEMENT_STAIRS_SIDE
+ k19_StairsFrontElemType = 19 // @ C19_ELEMENT_STAIRS_FRONT
}; // @ C[-2..19]_ELEMENT_...
-#define k0x8000_championBones 0x8000 // @ MASK0x8000_CHAMPION_BONES
-#define k0x7FFF_thingType 0x7FFF // @ MASK0x7FFF_THING_TYPE
+#define k0x8000_championBones 0x8000 // @ MASK0x8000_CHAMPION_BONES
+#define k0x7FFF_thingType 0x7FFF // @ MASK0x7FFF_THING_TYPE
class ObjectInfoIndex {
public:
@@ -724,10 +724,10 @@ public:
bool _isFacingAlcove; // @ G0286_B_FacingAlcove
bool _isFacingViAltar; // @ G0287_B_FacingViAltar
bool _isFacingFountain; // @ G0288_B_FacingFountain
- ElementType _squareAheadElement; // @ G0285_i_SquareAheadElement
+ ElementType _squareAheadElement; // @ G0285_i_SquareAheadElement
Thing _pileTopObject[5]; // @ G0292_aT_PileTopObject
DoorInfo _currMapDoorInfo[2]; // @ G0275_as_CurrentMapDoorInfo
-
+
ObjectInfoIndex _objectInfos[180]; // @ G0237_as_Graphic559_ObjectInfo
ArmourInfo _armourInfos[58]; // @ G0239_as_Graphic559_ArmourInfo
WeaponInfo _weaponInfos[46]; // @ G0238_as_Graphic559_WeaponInfo
Commit: 426c3eb0d8dabe814f59e144761ac7b1487f4437
https://github.com/scummvm/scummvm/commit/426c3eb0d8dabe814f59e144761ac7b1487f4437
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
DM: Fix warning
Changed paths:
engines/dm/dungeonman.h
diff --git a/engines/dm/dungeonman.h b/engines/dm/dungeonman.h
index 152d92f..c3176a5 100644
--- a/engines/dm/dungeonman.h
+++ b/engines/dm/dungeonman.h
@@ -119,7 +119,7 @@ enum SquareAspect {
kDMSquareAspectStairsUp = 2, // @ C2_STAIRS_UP
kDMSquareAspectDoorState = 2, // @ C2_DOOR_STATE
kDMSquareAspectDoorThingIndex = 3, // @ C3_DOOR_THING_INDEX
- kDMSquareAspectFloorOrn = 4, // @ C4_FLOOR_ORNAMENT_ORDINAL
+ kDMSquareAspectFloorOrn = 4 // @ C4_FLOOR_ORNAMENT_ORDINAL
};
#define k15_immuneToFire 15 // @ C15_IMMUNE_TO_FIRE
Commit: 802ec48a3da469ee0843eb2637108510ab953acb
https://github.com/scummvm/scummvm/commit/802ec48a3da469ee0843eb2637108510ab953acb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
DM: Fix variable clash
Changed paths:
engines/dm/menus.cpp
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index 5e1dd58..f98e894 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -885,8 +885,8 @@ void MenuMan::addChampionSymbol(int16 symbolIndex) {
uint16 symbolStep = casterChampion->_symbolStep;
uint16 manaCost = symbolBaseManaCost[symbolStep][symbolIndex];
if (symbolStep) {
- uint16 symbolIndex = casterChampion->_symbols[0] - 96;
- manaCost = (manaCost * symbolManaCostMultiplier[symbolIndex]) >> 3;
+ uint16 symbolIndex1 = casterChampion->_symbols[0] - 96;
+ manaCost = (manaCost * symbolManaCostMultiplier[symbolIndex1]) >> 3;
}
if (manaCost <= casterChampion->_currMana) {
Commit: efe44f1eb0bfdd653d57be8dcca7369f9adf92af
https://github.com/scummvm/scummvm/commit/efe44f1eb0bfdd653d57be8dcca7369f9adf92af
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
DM: Fix warning
Changed paths:
engines/dm/menus.cpp
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index f98e894..ccc4b30 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -1555,7 +1555,7 @@ void MenuMan::printMessageAfterReplacements(const char *str) {
char outputString[128];
char *curCharacter = outputString;
*curCharacter++ = '\n'; /* New line */
- char *replacementString = "";
+ const char *replacementString = "";
do {
if (*str == '@') {
str++;
Commit: c673c5654bb7ea17dc15691f6dd1a1298be25cbc
https://github.com/scummvm/scummvm/commit/c673c5654bb7ea17dc15691f6dd1a1298be25cbc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
DM: Fix comparison warnings
Changed paths:
engines/dm/menus.cpp
engines/dm/movesens.cpp
diff --git a/engines/dm/menus.cpp b/engines/dm/menus.cpp
index ccc4b30..31f6224 100644
--- a/engines/dm/menus.cpp
+++ b/engines/dm/menus.cpp
@@ -1286,11 +1286,11 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) {
break;
case kDMActionFreezeLife: {
int16 freezeTicks;
- if (weaponInHand->getType() == k42_JunkTypeMagicalBoxBlue) {
+ if (weaponInHand->getType() == (int)k42_JunkTypeMagicalBoxBlue) {
freezeTicks = 30;
_vm->_championMan->getObjectRemovedFromSlot(champIndex, kDMSlotActionHand);
weaponInHand->setNextThing(Thing::_none);
- } else if (weaponInHand->getType() == k43_JunkTypeMagicalBoxGreen) {
+ } else if (weaponInHand->getType() == (int)k43_JunkTypeMagicalBoxGreen) {
freezeTicks = 125;
_vm->_championMan->getObjectRemovedFromSlot(champIndex, kDMSlotActionHand);
weaponInHand->setNextThing(Thing::_none);
@@ -1308,7 +1308,7 @@ bool MenuMan::isActionPerformed(uint16 champIndex, int16 actionIndex) {
break;
case kDMActionThrow:
setChampionDirectionToPartyDirection(curChampion);
- actionPerformed = _vm->_championMan->isObjectThrown(champIndex, kDMSlotActionHand, (curChampion->_cell == _vm->turnDirRight(_vm->_dungeonMan->_partyDir)) || (curChampion->_cell == (ViewCell)_vm->returnOppositeDir(_vm->_dungeonMan->_partyDir)));
+ actionPerformed = _vm->_championMan->isObjectThrown(champIndex, kDMSlotActionHand, (curChampion->_cell == (ViewCell)_vm->turnDirRight(_vm->_dungeonMan->_partyDir)) || (curChampion->_cell == (ViewCell)_vm->returnOppositeDir(_vm->_dungeonMan->_partyDir)));
if (actionPerformed)
_vm->_timeline->_events[curChampion->_enableActionEventIndex]._Bu._slotOrdinal = _vm->indexToOrdinal(kDMSlotActionHand);
break;
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp
index e464c9f..2c25371 100644
--- a/engines/dm/movesens.cpp
+++ b/engines/dm/movesens.cpp
@@ -264,7 +264,7 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
for (int16 chainedMoveCount = 1000; --chainedMoveCount; ) {
destinationSquareData = _vm->_dungeonMan->_currMapData[destMapX][destMapY];
SquareType destinationSquareType = Square(destinationSquareData).getType();
- if (destinationSquareType == kDMElementTypeTeleporter) {
+ if (destinationSquareType == (int)kDMElementTypeTeleporter) {
if (!getFlag(destinationSquareData, k0x0008_TeleporterOpen))
break;
@@ -307,7 +307,7 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
if (destinationIsTeleporterTarget)
break;
} else {
- if ((destinationSquareType == kDMElementTypePit) && !thingLevitates && getFlag(destinationSquareData, k0x0008_PitOpen) && !getFlag(destinationSquareData, k0x0001_PitImaginary)) {
+ if ((destinationSquareType == (int)kDMElementTypePit) && !thingLevitates && getFlag(destinationSquareData, k0x0008_PitOpen) && !getFlag(destinationSquareData, k0x0001_PitImaginary)) {
if (drawDungeonViewWhileFalling && !_useRopeToClimbDownPit) {
drawDungeonViewWhileFalling = true;
if (traversedPitCount) {
@@ -346,7 +346,7 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
if (outcome == k1_outcomeKilledSomeCreaturesInGroup)
_vm->_groupMan->dropMovingCreatureFixedPossession(thing, destMapX, destMapY);
}
- } else if ((destinationSquareType == kDMElementTypeStairs) && (thing != Thing::_party) && (thingType != kDMThingTypeProjectile)) {
+ } else if ((destinationSquareType == (int)kDMElementTypeStairs) && (thing != Thing::_party) && (thingType != kDMThingTypeProjectile)) {
if (!getFlag(destinationSquareData, k0x0004_StairsUp)) {
mapIndexDestination = _vm->_dungeonMan->getLocationAfterLevelChange(mapIndexDestination, 1, &destMapX, &destMapY);
_vm->_dungeonMan->setCurrentMap(mapIndexDestination);
@@ -916,7 +916,7 @@ void MovesensMan::triggerEffect(Sensor *sensor, int16 effect, int16 mapX, int16
int16 targetMapY = sensor->getActionTargetMapY();
SquareType curSquareType = Square(_vm->_dungeonMan->_currMapData[targetMapX][targetMapY]).getType();
uint16 targetCell;
- if (curSquareType == kDMElementTypeWall)
+ if (curSquareType == (int)kDMElementTypeWall)
targetCell = sensor->getActionTargetCell();
else
targetCell = kDMCellNorthWest;
Commit: a48d15c758852f6e25092bc10b02a6c437f87997
https://github.com/scummvm/scummvm/commit/a48d15c758852f6e25092bc10b02a6c437f87997
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
DM: Fix variable shadowing warning
Changed paths:
engines/dm/movesens.cpp
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp
index 2c25371..0bc77d5 100644
--- a/engines/dm/movesens.cpp
+++ b/engines/dm/movesens.cpp
@@ -71,7 +71,7 @@ bool MovesensMan::sensorIsTriggeredByClickOnWall(int16 mapX, int16 mapY, uint16
thingBeingProcessed = _vm->_dungeonMan->getNextThing(thingBeingProcessed);
}
- for (Thing thingBeingProcessed = squareFirstThing; thingBeingProcessed != Thing::_endOfList; thingBeingProcessed = _vm->_dungeonMan->getNextThing(thingBeingProcessed)) {
+ for (thingBeingProcessed = squareFirstThing; thingBeingProcessed != Thing::_endOfList; thingBeingProcessed = _vm->_dungeonMan->getNextThing(thingBeingProcessed)) {
Thing lastProcessedThing = thingBeingProcessed;
uint16 ProcessedThingType = thingBeingProcessed.getType();
if (ProcessedThingType == kDMThingTypeSensor) {
Commit: be12f7a835aa72f7d9a04d9277d3df1b76279ca7
https://github.com/scummvm/scummvm/commit/be12f7a835aa72f7d9a04d9277d3df1b76279ca7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-09-11T23:32:40+02:00
Commit Message:
DM: Fix another variable shadowing.
NOTE: This affects the logic flow, so needs to be checked against original
Changed paths:
engines/dm/movesens.cpp
diff --git a/engines/dm/movesens.cpp b/engines/dm/movesens.cpp
index 0bc77d5..326affc 100644
--- a/engines/dm/movesens.cpp
+++ b/engines/dm/movesens.cpp
@@ -354,7 +354,7 @@ bool MovesensMan::getMoveResult(Thing thing, int16 mapX, int16 mapY, int16 destM
direction = _vm->_dungeonMan->getStairsExitDirection(destMapX, destMapY);
destMapX += _vm->_dirIntoStepCountEast[direction], destMapY += _vm->_dirIntoStepCountNorth[direction];
direction = _vm->returnOppositeDir((Direction)direction);
- uint16 thingCell = thing.getCell();
+ thingCell = thing.getCell();
thingCell = _vm->normalizeModulo4((((thingCell - direction + 1) & 0x0002) >> 1) + direction);
thing = _vm->thingWithNewCell(thing, thingCell);
} else
More information about the Scummvm-git-logs
mailing list