Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Extend 0-hp non-solid decorations edge case to allow building under things. fixes war1gus #220

Browse source
This commit is contained in:
Tim Felgentreff 2021-11-13 20:12:31 +01:00
parent b3b19b6aa8
commit 3dec8d3f74
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/unit/unittype.cpp
View file

@ -650,17 +650,18 @@ void UpdateUnitStats(CUnitType &type, int reset)
// Non-solid units can always be entered and they don't block anything
if (type.BoolFlag[NONSOLID_INDEX].value) {
if (type.Building) {
type.MovementMask = MapFieldLandUnit |
MapFieldSeaUnit |
MapFieldBuilding |
MapFieldCoastAllowed |
MapFieldWaterAllowed |
MapFieldNoBuilding |
MapFieldUnpassable;
if (type.BoolFlag[DECORATION_INDEX].value && type.MapDefaultStat.Variables[HP_INDEX].Max == 0) {
// special case, a decoration with no HP can always be built over
type.MovementMask = 0;
type.FieldFlags = 0;
} else {
type.MovementMask = MapFieldLandUnit |
MapFieldSeaUnit |
MapFieldBuilding |
MapFieldCoastAllowed |
MapFieldWaterAllowed |
MapFieldNoBuilding |
MapFieldUnpassable;
type.FieldFlags = MapFieldNoBuilding;
}
} else {