Object Property Enum

5 files changed, 13 insertions, 13 deletions

diff --git a/src/d/a/obj/d_a_obj_fairy.cpp b/src/d/a/obj/d_a_obj_fairy.cpp
index fe12be21..bdc0bf8a 100644
--- a/src/d/a/obj/d_a_obj_fairy.cpp
+++ b/src/d/a/obj/d_a_obj_fairy.cpp
@@ -96,7 +96,7 @@ void dAcObjFairy_c::executeState_CatchDemo() {
 }
 void dAcObjFairy_c::finalizeState_CatchDemo() {
     field_0xB89 = 0;
-    unsetObjectProperty(0x200);
+    unsetObjectProperty(OBJ_PROP_0x200);
 }
 
 bool dAcObjFairy_c::shouldAvoidLink() const {
diff --git a/src/d/a/obj/d_a_obj_switch.cpp b/src/d/a/obj/d_a_obj_switch.cpp
index 6bd51b37..9f75909b 100644
--- a/src/d/a/obj/d_a_obj_switch.cpp
+++ b/src/d/a/obj/d_a_obj_switch.cpp
@@ -66,7 +66,7 @@ void dAcOsw_c::rideCallback(dBgW *unknown, dAcObjBase_c *actor, dAcObjBase_c *in
             }
         }
     }
-    interactor->setObjectProperty(0x40);
+    interactor->setObjectProperty(OBJ_PROP_0x40);
 }
 
 bool dAcOsw_c::createHeap() {
diff --git a/src/d/a/obj/d_a_obj_tbox.cpp b/src/d/a/obj/d_a_obj_tbox.cpp
index c61e6886..830b554d 100644
--- a/src/d/a/obj/d_a_obj_tbox.cpp
+++ b/src/d/a/obj/d_a_obj_tbox.cpp
@@ -1192,9 +1192,9 @@ int dAcTbox_c::actorExecute() {
     dRoom_c *r = dStage_c::GetInstance()->getRoom(mRoomID);
     bool hasFlags = r->checkFlag(0x1E);
     if (hasFlags) {
-        setObjectProperty(0x200);
+        setObjectProperty(OBJ_PROP_0x200);
     } else {
-        unsetObjectProperty(0x200);
+        unsetObjectProperty(OBJ_PROP_0x200);
     }
 
     if (hasFlags) {
@@ -1328,9 +1328,9 @@ int dAcTbox_c::actorExecuteInEvent() {
     dRoom_c *r = dStage_c::GetInstance()->getRoom(mRoomID);
     bool hasFlags = r->checkFlag(0x1E);
     if (hasFlags) {
-        setObjectProperty(0x200);
+        setObjectProperty(OBJ_PROP_0x200);
     } else {
-        unsetObjectProperty(0x200);
+        unsetObjectProperty(OBJ_PROP_0x200);
     }
 
     if (hasFlags) {
diff --git a/src/d/d_linkage.cpp b/src/d/d_linkage.cpp
index b2e3f719..3c44fafd 100644
--- a/src/d/d_linkage.cpp
+++ b/src/d/d_linkage.cpp
@@ -72,16 +72,16 @@ bool dLinkage_c::tryAttach(
             return false;
         }
     }
-    pActor->unsetObjectProperty(0x1000);
-    pActor->unsetObjectProperty(0x4);
+    pActor->unsetObjectProperty(dAcObjBase_c::OBJ_PROP_0x1000);
+    pActor->unsetObjectProperty(dAcObjBase_c::OBJ_PROP_0x4);
     mControllingActor.link(pSrc);
     mState = STATE_ACTIVE;
     mType = type;
 
     if (type == CONNECTION_4) {
-        pActor->setObjectProperty(0x4);
+        pActor->setObjectProperty(dAcObjBase_c::OBJ_PROP_0x4);
     } else if (type == CONNECTION_7) {
-        pActor->setObjectProperty(0x1000);
+        pActor->setObjectProperty(dAcObjBase_c::OBJ_PROP_0x1000);
         field_0x1A = 4;
     }
     MTXIdentity(carryTransMtx);
@@ -134,11 +134,11 @@ void dLinkage_c::fn_80050EB0(dAcObjBase_c *pActor) {
         MTXIdentity(carryTransMtx);
     } else if (mType == CONNECTION_4) {
         if (pActor) {
-            pActor->unsetObjectProperty(0x4);
+            pActor->unsetObjectProperty(dAcObjBase_c::OBJ_PROP_0x4);
         }
     } else if (mType == CONNECTION_7) {
         if (pActor) {
-            pActor->unsetObjectProperty(0x1000);
+            pActor->unsetObjectProperty(dAcObjBase_c::OBJ_PROP_0x1000);
         }
     }
 
diff --git a/src/d/d_player_mdl.cpp b/src/d/d_player_mdl.cpp
index 8e67a1bf..19d7b35c 100644
--- a/src/d/d_player_mdl.cpp
+++ b/src/d/d_player_mdl.cpp
@@ -1958,6 +1958,6 @@ bool daPlayerModelBase_c::fn_80061410() {
 // and this causes the vtable and all other weak functions to be here
 /* vt 0x114 */ void daPlayerModelBase_c::somethingWithCarriedActorFlags() {
     if (mCarriedActorRef.get() != nullptr) {
-        mCarriedActorRef.get()->setObjectProperty(0x200);
+        mCarriedActorRef.get()->setObjectProperty(OBJ_PROP_0x200);
     }
 }