Merge with develop

This commit is contained in:
kervala 2016-06-11 20:32:19 +02:00
parent e3c977ee57
commit 8ab7ef6149

View file

@ -354,18 +354,18 @@ public:
if ( entity.AssociationBitsSent == currentAssociationBits ) if ( entity.AssociationBitsSent == currentAssociationBits )
{ {
//nlassertex(entity.Used, ("client=%d, entity=%d property=%d", clientId, entityId, property)); //nlassertex(entity.Used, ("client=%d, entity=%d property=%d", clientId, entityId, property));
switch ( property ) if (property == CLFECOMMON::PROPERTY_DISASSOCIATION)
{
// don't do anything
}
else if (property == CLFECOMMON::PROPERTY_POSITION)
{ {
case CLFECOMMON::PROPERTY_DISASSOCIATION:
break;
case CLFECOMMON::PROPERTY_POSITION:
entity.Mileage = 0; entity.Mileage = 0;
break; }
default: else
{ {
CPropertyEntry &entry = entity.Properties[property]; CPropertyEntry &entry = entity.Properties[property];
entry.HasValue = false; entry.HasValue = false;
}
} }
return true; return true;
} }