Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-07 02:01:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix build after rebase

Browse source
This commit is contained in:
Andrew Meadows 2018-12-21 11:55:22 -08:00
parent 27318a3f17
commit 9d6acf007a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityTypes.cpp
View file

@ -59,7 +59,7 @@ REGISTER_ENTITY_TYPE(Zone)
REGISTER_ENTITY_TYPE(Material) REGISTER_ENTITY_TYPE(Material)
bool EntityTypes::typeIsValid(EntityType type) { bool EntityTypes::typeIsValid(EntityType type) {
return type > EntityType::Unknown && type <= EntityType::LAST; return type > EntityType::Unknown && type <= EntityType::NUM_TYPES;
} }
const QString& EntityTypes::getEntityTypeName(EntityType entityType) { const QString& EntityTypes::getEntityTypeName(EntityType entityType) {
@ -144,7 +144,7 @@ EntityItemPointer EntityTypes::constructEntityItem(const unsigned char* data, in
QUuid id; QUuid id;
EntityTypes::EntityType type = EntityTypes::Unknown; EntityTypes::EntityType type = EntityTypes::Unknown;
extractEntityTypeAndID(data, bytesToRead, type, id); extractEntityTypeAndID(data, bytesToRead, type, id);
if (type > EntityTypes::Unknown && type <= EntityTypes::LAST) { if (type > EntityTypes::Unknown && type <= EntityTypes::NUM_TYPES) {
EntityItemID tempEntityID(id); EntityItemID tempEntityID(id);
EntityItemProperties tempProperties; EntityItemProperties tempProperties;
return constructEntityItem(type, tempEntityID, tempProperties); return constructEntityItem(type, tempEntityID, tempProperties);