swg-ostrich/src
1
0
Fork 0
mirror of https://github.com/swg-ostrich/src.git synced 2026-01-16 23:05:03 -05:00
Code Issues Projects Releases Wiki Activity

Added ability to not perform LOS checks if a target object has the skipLosCheck objvar

Browse Source
This commit is contained in:
seefo
2019-03-13 19:46:34 -04:00
parent 65ee22dc2a
commit f1b3761b31
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
View File

@@ -240,6 +240,9 @@ const std::string OBJVAR_PLAYER_HOUSE_ID("residenceHouseId");
static const unsigned MAX_ATTEMPTS_TO_REMOVE_PET_FROM_GROUP = 30;
static const int TIME_BETWEEN_ATTEMPTS_TO_REMOVE_PET = 1;
// used to determine if LOS-checks should be skipped during CreatureObject::canManipulateObject
static const std::string OBJVAR_SKIP_LOS_CHECK("skipLosCheck");
// creature regen constants
const static std::string CREATURES_TABLE("datatables/mob/creatures.iff");
@@ -1458,11 +1461,11 @@ bool CreatureObject::canManipulateObject(ServerObject const &target, bool moving
}
}
// skip LOS check if the item is being restored as part of decoration layout restore
// skip LOS check if the item is being restored as part of decoration layout restore or if it has the skipLOS objvar
PlayerObject const * const playerObject = PlayerCreatureController::getPlayerObject(this);
if (!playerObject || (playerObject->getRestoreDecorationObjectBeingRestored() != target.getNetworkId()))
{
if (!checkLOSTo(*firstParentInWorld))
if (!target.getObjVars().hasItem(OBJVAR_SKIP_LOS_CHECK) && !checkLOSTo(*firstParentInWorld))
{
code = Container::CEC_CantSee;
// DEBUG_REPORT_LOG(true, ("LOS check failed in can manipulate\n"));