From 62ff8bf7357ed58e774129f500a64d60feb22118 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 8 Apr 2015 17:07:20 -0700 Subject: [PATCH] set PROP_LAST_ITEM automatically --- libraries/entities/src/EntityItemProperties.cpp | 2 ++ libraries/entities/src/EntityItemProperties.h | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index b1bc1008e1..bf2ea640f1 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -27,6 +27,8 @@ #include "ParticleEffectEntityItem.h" +EntityPropertyList PROP_LAST_ITEM = (EntityPropertyList)(PROP_AFTER_LAST_ITEM - 1); + EntityItemProperties::EntityItemProperties() : CONSTRUCT_PROPERTY(visible, ENTITY_ITEM_DEFAULT_VISIBLE), diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 8987a41695..7de0fc0e8b 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -99,8 +99,8 @@ enum EntityPropertyList { PROP_SIMULATOR_ID, //////////////////////////////////////////////////////////////////////////////////////////////////// - // ATTENTION: add new properties ABOVE this line and then modify PROP_LAST_ITEM below - PROP_LAST_ITEM = PROP_MARKETPLACE_ID, + // ATTENTION: add new properties ABOVE this line + PROP_AFTER_LAST_ITEM, //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -119,6 +119,10 @@ enum EntityPropertyList { typedef PropertyFlags EntityPropertyFlags; +// this is set at the top of EntityItemProperties.cpp to PROP_AFTER_LAST_ITEM - 1. PROP_AFTER_LAST_ITEM is always +// one greater than the last item property due to the enum's auto-incrementing. +extern EntityPropertyList PROP_LAST_ITEM; + const quint64 UNKNOWN_CREATED_TIME = 0; /// A collection of properties of an entity item used in the scripting API. Translates between the actual properties of an