thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DM: Fix addActiveGroup with groupGenerator

Browse source
This commit is contained in:
Bendegúz Nagy 2016-08-12 10:20:44 +02:00
parent c798b1ca02
commit 0bd785e7eb
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/dm/gfx.cpp
View file

@ -3645,8 +3645,7 @@ bool DisplayMan::f491_isDerivedBitmapInCache(int16 derivedBitmapIndex) {
_g638_derivedBitmaps[derivedBitmapIndex] = new byte[_g639_derivedBitmapByteCount[derivedBitmapIndex] * 2];
return false;
} else {
warning(false, "f491_isDerivedBitmapInCache always returns false");
return false;
return true;
}
}

6
engines/dm/group.cpp
View file

@ -1698,10 +1698,8 @@ void GroupMan::f183_addActiveGroup(Thing thing, int16 mapX, int16 mapY) {
}
_g377_currActiveGroupCount++;
warning(false, "Code differs from the original in GroupMan::f183_addActiveGroup");
//L0340_ps_Group = ((Group *)_vm->_dungeonMan->_g284_thingData[k4_GroupThingType]) + (L0341_ps_ActiveGroup->_groupThingIndex = (thing).getType());
L0341_ps_ActiveGroup->_groupThingIndex = thing.getType();
L0340_ps_Group = (Group*)_vm->_dungeonMan->f156_getThingData(f175_groupGetThing(mapX, mapY));
L0340_ps_Group = (Group *)(_vm->_dungeonMan->_g284_thingData[k4_GroupThingType] +
g235_ThingDataWordCount[k4_GroupThingType] * (L0341_ps_ActiveGroup->_groupThingIndex = (thing).getIndex()));
L0341_ps_ActiveGroup->_cells = L0340_ps_Group->_cells;
L0340_ps_Group->getActiveGroupIndex() = L0344_i_ActiveGroupIndex;