Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Cleanup some RYZOMID code

Browse source
This commit is contained in:
kaetemi 2014-09-08 09:48:28 +02:00
parent 424b5af411
commit fa975bedb3
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
code/ryzom/common/src/game_share/ryzom_entity_id.h
View file

@ -30,12 +30,17 @@ namespace RYZOMID
{ {
// warning: respect separation with creature /object, it's used in front-end vision prioritizer // warning: respect separation with creature /object, it's used in front-end vision prioritizer
// creature part (include player) // creature part (include player)
player = 0, creature_begin = 0,
npc, //1 player = creature_begin,
creature, //2 bot_ai_begin,
mount, //3 npc = bot_begin, //1
pack_animal, //4 creature, //2
flora, //5 mount, //3
pack_animal, //4
flora, //5
bot_ai_end = flora,
creature_end = bot_end,
// objects part // objects part
object, // 6 object, // 6
building, // 7 building, // 7

8
code/ryzom/server/src/entities_game_service/player_manager/character.cpp
View file

@ -16324,13 +16324,7 @@ void CCharacter::sendEmote( const NLMISC::CEntityId& id, MBEHAV::EBehaviour beha
} }
CEntityId targetId = getTarget(); CEntityId targetId = getTarget();
if ( targetId.getType() != RYZOMID::npc && if (targetId.getType() > creature_end)
targetId.getType() != RYZOMID::player &&
targetId.getType() != RYZOMID::creature &&
targetId.getType() != RYZOMID::mount &&
targetId.getType() != RYZOMID::pack_animal &&
targetId.getType() != RYZOMID::flora
)
targetId = CEntityId::Unknown; targetId = CEntityId::Unknown;
TDataSetRow targetRow = TheDataset.getDataSetRow( targetId ); TDataSetRow targetRow = TheDataset.getDataSetRow( targetId );

2
code/ryzom/server/src/frontend_service/distance_prioritizer.cpp
View file

@ -915,7 +915,7 @@ inline void CDistancePrioritizer::serialSlotHeader( CClientHost& client, CEntit
timestampDelta = 15; timestampDelta = 15;
timestampDelta |= 0x10; // 'timestampIsThere bit': first bit is bit 5 (high to low order) 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 // 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 //if ( _VisualPropertyTreeRoot->B->B->getSHEETnode()->BranchHasPayload ) // assumes this is done after arbitrateDiscreetProperties() // CHANGED BEN

2
code/ryzom/server/src/gpm_service/world_entity.cpp
View file

@ -161,7 +161,7 @@ void CWorldEntity::init( const CEntityId& id, const TDataSetRow &index )
{ {
_Type = Trigger; _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; _Type = AI;
} }