[Scummvm-git-logs] scummvm master -> 197e85176e00b59444d0a19297e301048cd8fd93
Strangerke
Strangerke at scummvm.org
Mon Sep 19 01:05:47 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
197e85176e DM: Remove a couple of useless checks
Commit: 197e85176e00b59444d0a19297e301048cd8fd93
https://github.com/scummvm/scummvm/commit/197e85176e00b59444d0a19297e301048cd8fd93
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-09-19T00:55:11+02:00
Commit Message:
DM: Remove a couple of useless checks
Changed paths:
engines/dm/group.cpp
diff --git a/engines/dm/group.cpp b/engines/dm/group.cpp
index c464e38..c1598c4 100644
--- a/engines/dm/group.cpp
+++ b/engines/dm/group.cpp
@@ -1954,7 +1954,7 @@ bool GroupMan::isFluxcageOnSquare(int16 mapX, int16 mapY) {
}
void GroupMan::fuseAction(uint16 mapX, uint16 mapY) {
- if ((mapX < 0) || (mapX >= _vm->_dungeonMan->_currMapWidth) || (mapY < 0) || (mapY >= _vm->_dungeonMan->_currMapHeight))
+ if ((mapX >= _vm->_dungeonMan->_currMapWidth) || (mapY >= _vm->_dungeonMan->_currMapHeight))
return;
_vm->_projexpl->createExplosion(Thing::_explHarmNonMaterial, 255, mapX, mapY, kDMCreatureTypeSingleCenteredCreature); /* BUG0_17 The game crashes after the Fuse action is performed while looking at a wall on a map boundary. An explosion thing is created on the square in front of the party but there is no check to ensure the square coordinates are in the map bounds. This corrupts a memory location and leads to a game crash */
More information about the Scummvm-git-logs
mailing list