libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 04:01:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Update Crusader targetable status when shapes change

Browse Source
This commit is contained in:
Matthew Duggan 2021-04-07 23:24:27 +09:00
parent b5f3a83bae
commit 9408b5de08
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/ultima/ultima8/graphics/shape_info.h
View File

@ -144,6 +144,9 @@ public:
inline bool is_u8_explode() const {
return (_flags & SI_U8_EXPLODE) != 0;
}
inline bool is_targetable() const {
return (_flags & (SI_OCCL | SI_CRU_TARGETABLE));
}
bool hasQuantity() const {
return (_family == SF_QUANTITY || _family == SF_REAGENT);

27
engines/ultima/ultima8/world/item.cpp
View File

@ -469,11 +469,28 @@ Box Item::getWorldBox() const {
}
void Item::setShape(uint32 shape) {
_shape = shape;
_cachedShapeInfo = nullptr;
_cachedShape = nullptr;
// FIXME: In Crusader, here we should check if the shape
// changed from targetable to not-targetable, or vice-versa
if (GAME_IS_CRUSADER) {
// In Crusader, here we need to check if the shape
// changed from targetable to not-targetable, or vice-versa
const ShapeInfo *oldinfo = getShapeInfo();
_shape = shape;
_cachedShapeInfo = nullptr;
const ShapeInfo *newinfo = getShapeInfo();
if (!hasFlags(FLG_BROKEN)) {
if (oldinfo->is_targetable() && !newinfo->is_targetable()) {
World::get_instance()->getCurrentMap()->removeTargetItem(this);
}
else if (!oldinfo->is_targetable() && newinfo->is_targetable()) {
World::get_instance()->getCurrentMap()->addTargetItem(this);
}
}
} else {
_shape = shape;
_cachedShapeInfo = nullptr;
}
}
bool Item::overlaps(const Item &item2) const {
@ -1810,7 +1827,7 @@ void Item::enterFastArea() {
}
if (!hasFlags(FLG_BROKEN) && GAME_IS_CRUSADER) {
if ((si->_flags & ShapeInfo::SI_CRU_TARGETABLE) || (si->_flags & ShapeInfo::SI_OCCL)) {
if (si->is_targetable()) {
World::get_instance()->getCurrentMap()->addTargetItem(this);
}
if (_shape == SNAP_EGG_SHAPE) {