Merge pull request #857 from LagoLunatic/resenums

Fix resource header enums

3 files changed, 18 insertions, 10 deletions

diff --git a/src/d/actor/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp
index 6029162d..e7efada4 100644
--- a/src/d/actor/d_a_ikari.cpp
+++ b/src/d/actor/d_a_ikari.cpp
@@ -36,11 +36,19 @@ void daIkari_c::setMtx() {
 /* 000001C4-00000290       .text _createHeap__9daIkari_cFv */
 BOOL daIkari_c::_createHeap() {
     static int ikari_bdl[5] = {
+#if VERSION == VERSION_DEMO
+        IKARI_BMD_S_IKARI2,
+        IKARI_BMD_S_IKARI2,
+        IKARI_BMD_S_IKARI2,
+        IKARI_BMD_S_IKARI3,
+        IKARI_BMD_S_IKARI4,
+#else
         IKARI_BDL_S_IKARI2,
         IKARI_BDL_S_IKARI2,
         IKARI_BDL_S_IKARI2,
         IKARI_BDL_S_IKARI3,
         IKARI_BDL_S_IKARI4,
+#endif
     };
 
     J3DModelData* modelData =
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index 1b59b337..f7c3ec8e 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -105,13 +105,13 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 
 /* 000007AC-00000A24       .text CreateHeap__8daMozo_cFv */
 BOOL daMozo_c::CreateHeap() {
-    J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_BDL_MOZ);
+    J3DModelData* mdlData = (J3DModelData*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BDL_MOZ);
     
     mDoExt_McaMorf* newMorf =  new mDoExt_McaMorf(
         mdlData,
         0,
         0,
-        static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", MOZO_BCK_MOZ)),
+        static_cast<J3DAnmTransformKey*>(dComIfG_getObjectRes("Mozo", MOZO_INDEX_BCK_MOZ)),
         J3DFrameCtrl::EMode_LOOP,
         1.0f,
         0,
@@ -124,10 +124,10 @@ BOOL daMozo_c::CreateHeap() {
     
     mAnimMorf = newMorf;
 
-    m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_BRK_MOZ);
+    m_brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BRK_MOZ);
     JUT_ASSERT(0x16A, m_brk != NULL);
 
-    m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_BTK_MOZ);
+    m_btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Mozo", MOZO_INDEX_BTK_MOZ);
     JUT_ASSERT(0x16D, m_btk != NULL);
 
     int brkInitResult = mBrkAnm.init(mdlData, m_brk, true, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false, 0);
diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp
index 903b877c..60273fc9 100644
--- a/src/d/actor/d_a_obj_roten.cpp
+++ b/src/d/actor/d_a_obj_roten.cpp
@@ -37,14 +37,14 @@ static BOOL CheckCreateHeap(fopAc_ac_c* i_this) {
 /* 000001A8-000002E4       .text CreateHeap__13daObj_Roten_cFv */
 BOOL daObj_Roten_c::CreateHeap() {
     static u32 bdl_arc_idx[] = {
-        ROTEN_BDL_ROTEN02,
-        ROTEN_BDL_ROTEN03,
-        ROTEN_BDL_ROTEN04
+        ROTEN_INDEX_BDL_ROTEN02,
+        ROTEN_INDEX_BDL_ROTEN03,
+        ROTEN_INDEX_BDL_ROTEN04
     };
     static u32 dzb_arc_idx[] = {
-        ROTEN_DZB_ROTEN02,
-        ROTEN_DZB_ROTEN03,
-        ROTEN_DZB_ROTEN04
+        ROTEN_INDEX_DZB_ROTEN02,
+        ROTEN_INDEX_DZB_ROTEN03,
+        ROTEN_INDEX_DZB_ROTEN04
     };
 
     J3DModelData* modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes(M_arcname, bdl_arc_idx[mType]));