mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-17 21:11:39 +00:00
Cleanup some RYZOMID code
This commit is contained in:
parent
424b5af411
commit
fa975bedb3
4 changed files with 14 additions and 15 deletions
|
@ -30,12 +30,17 @@ namespace RYZOMID
|
|||
{
|
||||
// warning: respect separation with creature /object, it's used in front-end vision prioritizer
|
||||
// creature part (include player)
|
||||
player = 0,
|
||||
npc, //1
|
||||
creature, //2
|
||||
mount, //3
|
||||
pack_animal, //4
|
||||
flora, //5
|
||||
creature_begin = 0,
|
||||
player = creature_begin,
|
||||
bot_ai_begin,
|
||||
npc = bot_begin, //1
|
||||
creature, //2
|
||||
mount, //3
|
||||
pack_animal, //4
|
||||
flora, //5
|
||||
bot_ai_end = flora,
|
||||
creature_end = bot_end,
|
||||
|
||||
// objects part
|
||||
object, // 6
|
||||
building, // 7
|
||||
|
|
|
@ -16324,13 +16324,7 @@ void CCharacter::sendEmote( const NLMISC::CEntityId& id, MBEHAV::EBehaviour beha
|
|||
}
|
||||
|
||||
CEntityId targetId = getTarget();
|
||||
if ( targetId.getType() != RYZOMID::npc &&
|
||||
targetId.getType() != RYZOMID::player &&
|
||||
targetId.getType() != RYZOMID::creature &&
|
||||
targetId.getType() != RYZOMID::mount &&
|
||||
targetId.getType() != RYZOMID::pack_animal &&
|
||||
targetId.getType() != RYZOMID::flora
|
||||
)
|
||||
if (targetId.getType() > creature_end)
|
||||
targetId = CEntityId::Unknown;
|
||||
|
||||
TDataSetRow targetRow = TheDataset.getDataSetRow( targetId );
|
||||
|
|
|
@ -915,7 +915,7 @@ inline void CDistancePrioritizer::serialSlotHeader( CClientHost& client, CEntit
|
|||
timestampDelta = 15;
|
||||
timestampDelta |= 0x10; // 'timestampIsThere bit': first bit is bit 5 (high to low order)
|
||||
}
|
||||
else if ( seenEntityId.getType() >= RYZOMID::object )
|
||||
else if ( seenEntityId.getType() > RYZOMID::creature_end )
|
||||
{
|
||||
// For non-players/non-bots types (e.g. bags), set the timestamp delta if entity is being spawned to the client
|
||||
//if ( _VisualPropertyTreeRoot->B->B->getSHEETnode()->BranchHasPayload ) // assumes this is done after arbitrateDiscreetProperties() // CHANGED BEN
|
||||
|
|
|
@ -161,7 +161,7 @@ void CWorldEntity::init( const CEntityId& id, const TDataSetRow &index )
|
|||
{
|
||||
_Type = Trigger;
|
||||
}
|
||||
else if ( (id.getType() >= RYZOMID::npc ) || ( id.getType() <= RYZOMID::flora) )
|
||||
else if ((id.getType() >= RYZOMID::bot_ai_begin) && (id.getType() <= RYZOMID::bot_ai_end))
|
||||
{
|
||||
_Type = AI;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue