atdoor inlines

src/d/actor/d_a_amiprop.cpp

@@ -9,7 +9,9 @@
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_bg_s_movebg_actor.h"
+#if VERSION > VERSION_DEMO
 #include "d/d_vibration.h"
+#endif
 #include "d/res/res_hami1.h"
 
 static dCcD_SrcCyl l_cyl_src = {
@@ -56,14 +58,13 @@ namespace daAmiProp_prm {
 
 /* 00000078-000000D4       .text _delete__11daAmiProp_cFv */
 bool daAmiProp_c::_delete() {
-#if VERSION == VERSION_DEMO
-    dComIfG_Bgsp()->Release(unk_408);
-#else
-    if (heap != NULL) {
-        dComIfG_Bgsp()->Release(unk_408);
-    }
+#if VERSION > VERSION_DEMO
+    if (heap != NULL)
 #endif
-    dComIfG_resDeleteDemo(&unk_290, daAmiProp_c::m_arcname);
+    {
+        dComIfG_Bgsp()->Release(mpBgW);
+    }
+    dComIfG_resDeleteDemo(&mPhase, daAmiProp_c::m_arcname);
     return true;
 }
 
@@ -77,21 +78,21 @@ BOOL daAmiProp_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_BDL_HAMI1);
     JUT_ASSERT(VERSION_SELECT(250, 255, 255, 255), modelData != NULL);
 
-    unk_298 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
-    if (unk_298 == NULL) {
+    mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
+    if (mpModel == NULL) {
         return FALSE;
     }
 
-    unk_298->setUserArea(reinterpret_cast<u32>(this));
+    mpModel->setUserArea(reinterpret_cast<u32>(this));
     setMoveBGMtx();
 
-    unk_408 = new dBgW();
-    if (unk_408 != NULL) {
+    mpBgW = new dBgW();
+    if (mpBgW != NULL) {
         cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daAmiProp_c::m_arcname, HAMI1_DZB_HAMI1);
-        if (unk_408->Set(dzb, cBgW::MOVE_BG_e, &unk_40C) == true) {
+        if (mpBgW->Set(dzb, cBgW::MOVE_BG_e, &unk_40C) == true) {
             return FALSE;
         }
-        unk_408->SetCrrFunc(dBgS_MoveBGProc_TypicalRotY);
+        mpBgW->SetCrrFunc(dBgS_MoveBGProc_TypicalRotY);
     } else {
         return FALSE;
     }
@@ -101,23 +102,23 @@ BOOL daAmiProp_c::CreateHeap() {
 
 /* 00000244-00000318       .text CreateInit__11daAmiProp_cFv */
 void daAmiProp_c::CreateInit() {
-    fopAcM_SetMtx(this, unk_298->getBaseTRMtx());
+    fopAcM_SetMtx(this, mpModel->getBaseTRMtx());
     fopAcM_setCullSizeBox(this, -850.0f, -30.0f, -850.0f, 850.0f, 30.0f, 850.0f);
     fopAcM_setCullSizeFar(this, 1.0f);
-    unk_29C.Init(255, 255, this);
-    unk_2D8.Set(l_cyl_src);
-    unk_2D8.SetStts(&unk_29C);
+    mStts.Init(255, 255, this);
+    mCyl.Set(l_cyl_src);
+    mCyl.SetStts(&mStts);
     unk_43C = daAmiProp_prm::getSwitchNo(this);
     unk_446 = current.angle.x + 0x4000;
-    dComIfG_Bgsp()->Regist(unk_408, this);
+    dComIfG_Bgsp()->Regist(mpBgW, this);
     set_mtx();
-    unk_408->Move();
+    mpBgW->Move();
 }
 
 /* 00000318-00000444       .text _create__11daAmiProp_cFv */
 cPhs_State daAmiProp_c::_create() {
     fopAcM_SetupActor(this, daAmiProp_c);
-    cPhs_State ret = dComIfG_resLoad(&unk_290, daAmiProp_c::m_arcname);
+    cPhs_State ret = dComIfG_resLoad(&mPhase, daAmiProp_c::m_arcname);
 
     if (ret == cPhs_COMPLEATE_e) {
         if (!fopAcM_entrySolidHeap(this, CheckCreateHeap, 0xC00)) {
@@ -131,10 +132,10 @@ cPhs_State daAmiProp_c::_create() {
 
 /* 000005FC-00000694       .text set_mtx__11daAmiProp_cFv */
 void daAmiProp_c::set_mtx() {
-    unk_298->setBaseScale(scale);
+    mpModel->setBaseScale(scale);
     mDoMtx_stack_c::transS(current.pos);
     mDoMtx_stack_c::ZXYrotM(current.angle.x, current.angle.y, current.angle.z);
-    unk_298->setBaseTRMtx(mDoMtx_stack_c::get());
+    mpModel->setBaseTRMtx(mDoMtx_stack_c::get());
     MTXCopy(mDoMtx_stack_c::get(), unk_40C);
 }
 
@@ -169,7 +170,7 @@ bool daAmiProp_c::_execute() {
         if (tmp == 0) {
             unk_446 += 0x4000;
             unk_444 = false;
-#if VERSION != VERSION_DEMO
+#if VERSION > VERSION_DEMO
             dComIfGp_getVibration().StartShock(4, -0x21, cXyz(0.0f, 1.0f, 0.0f));
 #endif            
         } else {
@@ -179,17 +180,17 @@ bool daAmiProp_c::_execute() {
 
     unk_440 = is_switch;
     set_mtx();
-    unk_408->Move();
+    mpBgW->Move();
     return true;
 }
 
 /* 00000884-00000924       .text _draw__11daAmiProp_cFv */
 bool daAmiProp_c::_draw() {
     g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
-    g_env_light.setLightTevColorType(unk_298, &tevStr);
+    g_env_light.setLightTevColorType(mpModel, &tevStr);
 
     dComIfGd_setListBG();
-    mDoExt_modelUpdateDL(unk_298);
+    mDoExt_modelUpdateDL(mpModel);
     dComIfGd_setList();
     return true;
 }