Fix houses and monsters
This commit is contained in:
parent
ab1cc8c890
commit
4bfe9b640e
|
@ -111,8 +111,8 @@ void Spawn::save(TiXmlElement* node)
|
|||
const Position& placePos = pair.first;
|
||||
assert(placePos.isValid());
|
||||
|
||||
creatureNode->SetAttribute("x", c.x - placePos.x);
|
||||
creatureNode->SetAttribute("y", c.y - placePos.y);
|
||||
creatureNode->SetAttribute("x", placePos.x - c.x);
|
||||
creatureNode->SetAttribute("y", placePos.y - c.y);
|
||||
creatureNode->SetAttribute("z", placePos.z);
|
||||
|
||||
node->LinkEndChild(creatureNode);
|
||||
|
|
|
@ -136,9 +136,6 @@ void Map::loadOtbm(const std::string& fileName)
|
|||
|
||||
if((_flags & TILESTATE_REFRESH) == TILESTATE_REFRESH)
|
||||
flags |= TILESTATE_REFRESH;
|
||||
|
||||
if((_flags & TILESTATE_HOUSE) == TILESTATE_HOUSE)
|
||||
flags |= TILESTATE_HOUSE;
|
||||
break;
|
||||
}
|
||||
case OTBM_ATTR_ITEM: {
|
||||
|
@ -179,9 +176,9 @@ void Map::loadOtbm(const std::string& fileName)
|
|||
}
|
||||
|
||||
if(const TilePtr& tile = getTile(pos)) {
|
||||
if(tile->hasFlag(TILESTATE_HOUSE))
|
||||
tile->setFlags(tile->getFlags() & ~TILESTATE_HOUSE);
|
||||
tile->setFlags((tileflags_t)flags);
|
||||
if(house)
|
||||
tile->setFlag(TILESTATE_HOUSE);
|
||||
tile->setFlag(flags);
|
||||
}
|
||||
}
|
||||
} else if(mapDataType == OTBM_TOWNS) {
|
||||
|
|
Loading…
Reference in New Issue