Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:52:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

make sure properties include type for proper encoding

Browse source
This commit is contained in:
ZappoMan 2014-11-14 21:16:50 -08:00
parent 0cb95fc82a
commit 55ac9c8ef7
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -93,7 +93,6 @@ EntityItemProperties EntityScriptingInterface::getEntityProperties(EntityItemID
EntityItemID EntityScriptingInterface::editEntity(EntityItemID entityID, const EntityItemProperties& properties) { EntityItemID EntityScriptingInterface::editEntity(EntityItemID entityID, const EntityItemProperties& properties) {
EntityItemID actualID = entityID; EntityItemID actualID = entityID;
// if the entity is unknown, attempt to look it up // if the entity is unknown, attempt to look it up
if (!entityID.isKnownID) { if (!entityID.isKnownID) {
actualID = EntityItemID::getIDfromCreatorTokenID(entityID.creatorTokenID); actualID = EntityItemID::getIDfromCreatorTokenID(entityID.creatorTokenID);
@ -113,6 +112,18 @@ EntityItemID EntityScriptingInterface::editEntity(EntityItemID entityID, const E
// if at this point, we know the id, send the update to the entity server // if at this point, we know the id, send the update to the entity server
if (entityID.isKnownID) { if (entityID.isKnownID) {
// make sure the properties has a type, so that the encode can know which properties to include
if (properties.getType() == EntityTypes::Unknown) {
EntityItem* entity = _entityTree->findEntityByEntityItemID(entityID);
if (entity) {
EntityItemProperties tempProperties = properties;
tempProperties.setType(entity->getType());
queueEntityMessage(PacketTypeEntityAddOrEdit, entityID, tempProperties);
return entityID;
}
}
// if the properties already includes the type, then use it as is
queueEntityMessage(PacketTypeEntityAddOrEdit, entityID, properties); queueEntityMessage(PacketTypeEntityAddOrEdit, entityID, properties);
} }