diff --git a/src/d/actor/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp index 545db948a..530501397 100644 --- a/src/d/actor/d_a_fganon.cpp +++ b/src/d/actor/d_a_fganon.cpp @@ -2438,9 +2438,9 @@ static BOOL daFganon_Execute(fganon_class* i_this) { cLib_addCalc0(&i_this->m3BC, 1.0f, 1.0f); - J3DModel* mpModel = i_this->mpMorf->getModel(); + J3DModel* model = i_this->mpMorf->getModel(); - mpModel->setBaseScale(a_this->scale); + model->setBaseScale(a_this->scale); mDoMtx_stack_c::transS(a_this->current.pos.x + local_94.x, a_this->current.pos.y + local_94.y, a_this->current.pos.z + local_94.z); @@ -2452,10 +2452,10 @@ static BOOL daFganon_Execute(fganon_class* i_this) { mDoMtx_stack_c::XrotM(a_this->shape_angle.x + cos); mDoMtx_stack_c::ZrotM(a_this->shape_angle.z); - mpModel->setBaseTRMtx(mDoMtx_stack_c::get()); + model->setBaseTRMtx(mDoMtx_stack_c::get()); i_this->mpMorf->calc(); - MtxP mtx = mpModel->getAnmMtx(27); + MtxP mtx = model->getAnmMtx(27); cMtx_copy(mtx, *calc_mtx); MtxPosition(&local_70, &a_this->eyePos); diff --git a/src/d/actor/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp index 9d3dc6c83..08de9394e 100644 --- a/src/d/actor/d_a_ks.cpp +++ b/src/d/actor/d_a_ks.cpp @@ -808,7 +808,7 @@ void action_omoi(ks_class* i_this) { cXyz local_1c; cXyz local_10; - daPy_py_c* mpCurPlayerActor = (daPy_py_c*)daPy_getPlayerActorClass(); + daPy_py_c* player = (daPy_py_c*)daPy_getPlayerActorClass(); daPy_lk_c* link = daPy_getPlayerLinkActorClass(); if (i_this->m2CE == 1 && HEAVY_IN == TRUE) { @@ -923,7 +923,7 @@ void action_omoi(ks_class* i_this) { } #endif - fopAcM_SetRoomNo(actor, fopAcM_GetRoomNo(mpCurPlayerActor)); + fopAcM_SetRoomNo(actor, fopAcM_GetRoomNo(player)); if (!(fopAcM_GetID(actor) & 1)) { actor->shape_angle.y += i_this->m2FE * 0.25f; @@ -938,7 +938,7 @@ void action_omoi(ks_class* i_this) { local_10.z = i_this->m528[2][3]; } else { - local_10 = mpCurPlayerActor->current.pos; + local_10 = player->current.pos; } if (!(local_10.x || local_10.y || local_10.z)) { @@ -949,26 +949,26 @@ void action_omoi(ks_class* i_this) { i_this->mMode = 42; break; #else - local_10 = mpCurPlayerActor->current.pos; + local_10 = player->current.pos; #endif } - local_1c.x = std::fabsf(mpCurPlayerActor->speed.x * 10.0f); + local_1c.x = std::fabsf(player->speed.x * 10.0f); if (local_1c.x < REG12_F(16) + 10.0f) { local_1c.x = REG12_F(16) + 10.0f; } - local_1c.y = std::fabsf(mpCurPlayerActor->speed.y * 10.0f); + local_1c.y = std::fabsf(player->speed.y * 10.0f); if (local_1c.y < REG12_F(16) + 10.0f) { local_1c.y = REG12_F(16) + 10.0f; } - local_1c.z = std::fabsf(mpCurPlayerActor->speed.z * 10.0f); + local_1c.z = std::fabsf(player->speed.z * 10.0f); if (local_1c.z < REG12_F(16) + 10.0f) { local_1c.z = REG12_F(16) + 10.0f; } - if (std::sqrtf(SQUARE(mpCurPlayerActor->speed.x) + SQUARE(mpCurPlayerActor->speed.y) + SQUARE(mpCurPlayerActor->speed.z)) < REG12_F(17) + 8.0f) { + if (std::sqrtf(SQUARE(player->speed.x) + SQUARE(player->speed.y) + SQUARE(player->speed.z)) < REG12_F(17) + 8.0f) { local_1c.setall(REG12_F(18) + 8.0f); f32 x = actor->current.pos.x - local_10.x; @@ -1219,10 +1219,10 @@ void action_tubo_search(ks_class* i_this) { break; } case 51: { - fopAc_ac_c* mpCurrActor = (fopAc_ac_c*)fopAcM_SearchByID(i_this->mKsID); + fopAc_ac_c* ksActor = (fopAc_ac_c*)fopAcM_SearchByID(i_this->mKsID); - if (mpCurrActor) { - actor->current.pos = mpCurrActor->current.pos; + if (ksActor) { + actor->current.pos = ksActor->current.pos; if (!i_this->m318) { return; @@ -1355,13 +1355,13 @@ static BOOL daKS_Execute(ks_class* i_this) { } if (i_this->mGmID != 0 && i_this->mAction != 3) { - fopAc_ac_c* mpGmActor = fopAcM_SearchByID(i_this->mGmID); + fopAc_ac_c* gmActor = fopAcM_SearchByID(i_this->mGmID); bool bVar5 = false; - if (mpGmActor && ((fopAcM_GetParam(mpGmActor) & 0xff0000) == 0xff0000 || (fopAcM_GetParam(mpGmActor) & 0xff0000) == 0)) { - if (fopAcM_GetName(mpGmActor) == PROC_GM) { - if (mpGmActor->health <= 0) { + if (gmActor && ((fopAcM_GetParam(gmActor) & 0xff0000) == 0xff0000 || (fopAcM_GetParam(gmActor) & 0xff0000) == 0)) { + if (fopAcM_GetName(gmActor) == PROC_GM) { + if (gmActor->health <= 0) { bVar5 = true; } } @@ -1506,8 +1506,8 @@ static BOOL daKS_Delete(ks_class* i_this) { /* 000030F4-000034B0 .text useHeapInit__FP10fopAc_ac_c */ static BOOL useHeapInit(fopAc_ac_c* i_act) { - J3DModel* mpBodyModel; - J3DModel* mpEyeModel; + J3DModel* bodyModel; + J3DModel* eyeModel; ks_class* i_this = (ks_class*)i_act; @@ -1515,13 +1515,13 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 0, NULL, 0, 0x11020203); if (i_this->mpBodyMorf == NULL || i_this->mpBodyMorf->getModel() == NULL) return FALSE; - mpBodyModel = i_this->mpBodyMorf->getModel(); + bodyModel = i_this->mpBodyMorf->getModel(); i_this->mpBodyBrkAnm = new mDoExt_brkAnm(); if (i_this->mpBodyBrkAnm == NULL) return FALSE; - if (i_this->mpBodyBrkAnm->init(mpBodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_BODY), TRUE, J3DFrameCtrl::EMode_NONE) == 0) + if (i_this->mpBodyBrkAnm->init(bodyModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_BODY), TRUE, J3DFrameCtrl::EMode_NONE) == 0) return FALSE; @@ -1531,20 +1531,20 @@ static BOOL useHeapInit(fopAc_ac_c* i_act) { if (i_this->mpEyeMorf == NULL || i_this->mpEyeMorf->getModel() == NULL) return FALSE; - mpEyeModel = i_this->mpEyeMorf->getModel(); + eyeModel = i_this->mpEyeMorf->getModel(); i_this->mpEyeBtkAnm = new mDoExt_btkAnm(); if (i_this->mpEyeBtkAnm == NULL) return FALSE; - if (i_this->mpEyeBtkAnm->init(mpEyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", KS_BTK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) + if (i_this->mpEyeBtkAnm->init(eyeModel->getModelData(), (J3DAnmTextureSRTKey *)dComIfG_getObjectRes("KS", KS_BTK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) return FALSE; i_this->mpEyeBrkAnm = new mDoExt_brkAnm(); if (i_this->mpEyeBrkAnm == NULL) return FALSE; - if (i_this->mpEyeBrkAnm->init(mpEyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) { + if (i_this->mpEyeBrkAnm->init(eyeModel->getModelData(), (J3DAnmTevRegKey *)dComIfG_getObjectRes("KS", KS_BRK_KS_EYE), TRUE, J3DFrameCtrl::EMode_NONE) == 0) { return FALSE; } return TRUE; diff --git a/src/d/actor/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp index 2a1f86651..2543ac133 100644 --- a/src/d/actor/d_a_ship.cpp +++ b/src/d/actor/d_a_ship.cpp @@ -2801,8 +2801,8 @@ BOOL daShip_c::procTactWarp() { shape_angle.y += m03A6; current.angle.y = shape_angle.y; - daTornado_c* mpTornado = (daTornado_c*)fopAcM_SearchByID(mTactWarpID); - if (mpTornado == NULL || fpcM_IsCreating(mTactWarpID)) { + daTornado_c* tornado = (daTornado_c*)fopAcM_SearchByID(mTactWarpID); + if (tornado == NULL || fpcM_IsCreating(mTactWarpID)) { if (mTactWarpID == fpcM_ERROR_PROCESS_ID_e) { dComIfGp_event_reset(); m1984.remove(); @@ -2813,33 +2813,33 @@ BOOL daShip_c::procTactWarp() { res = FALSE; } else { - if (cLib_chaseS(&m03A6, 0x1C25, 0x40) && (mpTornado->mJointScale[10] > 0.8f)) { + if (cLib_chaseS(&m03A6, 0x1C25, 0x40) && (tornado->mJointScale[10] > 0.8f)) { speed.y += 1.0f; if (speed.y > 50.0f) { speed.y = 50.0f; } current.pos.y += speed.y; - mpTornado->current.pos.y = current.pos.y - 700.0f; + tornado->current.pos.y = current.pos.y - 700.0f; m1984.remove(); m1998.remove(); } else { if ((!m037A) && (m03A6 > 0x1000)) { m037A = 1; - mpTornado->m31c = 1; + tornado->m31c = 1; } } if (m037A == 1) { - cLib_chaseF(&mpTornado->current.pos.y, current.pos.y - 700.0f, 20.0f); + cLib_chaseF(&tornado->current.pos.y, current.pos.y - 700.0f, 20.0f); iVar4 = 0; for (int i = 0; i < 11; iVar4++, i++) { - if (current.pos.y < mpTornado->getJointYPos(i)) break; + if (current.pos.y < tornado->getJointYPos(i)) break; } if (iVar4 == 11) { iVar4 = 10; } - cLib_chaseF(¤t.pos.x, mpTornado->getJointXPos(iVar4), 50.0f); - cLib_chaseF(¤t.pos.z, mpTornado->getJointZPos(iVar4), 50.0f); + cLib_chaseF(¤t.pos.x, tornado->getJointXPos(iVar4), 50.0f); + cLib_chaseF(¤t.pos.z, tornado->getJointZPos(iVar4), 50.0f); } if (m037A != 2 && current.pos.y > m03F4 + 5000.0f ) { m037A = 2; @@ -4062,11 +4062,11 @@ BOOL daShip_c::execute() { cMtx_multVec(model1->getAnmMtx(10), &l_tiller_top_offset, &mTillerTopPos); daGrid_c* grid; - MtxP mMtx = model1->getAnmMtx(7); + MtxP mtx = model1->getAnmMtx(7); - m0444.x = mMtx[0][3]; - m0444.y = mMtx[1][3]; - m0444.z = mMtx[2][3]; + m0444.x = mtx[0][3]; + m0444.y = mtx[1][3]; + m0444.z = mtx[2][3]; cXyz spD8; grid = mpGrid; @@ -4077,7 +4077,7 @@ BOOL daShip_c::execute() { mpGrid->current.pos = m0444; mpGrid->current.angle = shape_angle; - cMtx_multVecSR(mMtx, &top_offset, &spD8); + cMtx_multVecSR(mtx, &top_offset, &spD8); mpGrid->scale.y = spD8.abs() / 365.0f; cMtx_multVecSR(model1->getAnmMtx(8), &XZ_top_offset, &spD8); @@ -4432,12 +4432,12 @@ BOOL daShip_c::createHeap() { if (mpBodyAnm && mpBodyAnm->getModel()) { J3DModel* pModel = mpBodyAnm->getModel(); - J3DSkinDeform* mSkinDeform = new J3DSkinDeform(); - if (mSkinDeform == NULL) { + J3DSkinDeform* skinDeform = new J3DSkinDeform(); + if (skinDeform == NULL) { return FALSE; } - if (pModel->setSkinDeform(mSkinDeform, 1) != J3DErrType_Success) { + if (pModel->setSkinDeform(skinDeform, 1) != J3DErrType_Success) { return FALSE; } } diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index ce2ee282f..8b9754640 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -184,8 +184,8 @@ void dMenu_Collect_c::screenSet() { "amulet_01.bti", }; - J2DPane* mPane = m004->search('ROOT'); - m2478 = mPane; + J2DPane* pane = m004->search('ROOT'); + m2478 = pane; fopMsgM_setPaneData(&m008, m004, 'ft15'); fopMsgM_setPaneData(&m040, m004, 'ft16'); diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index 32766f697..c1c746507 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -286,8 +286,8 @@ void dMenu_Option_c::cursorMove() { fopMsgM_cposMove(&mB30[i]); - J2DPane* mpPane = mB30[i].pane; - mpPane->rotate(mB30[i].mSize.x / 2.0f, mB30[i].mSize.y / 2.0f, ROTATE_Z, mpPane->getRotate()); + J2DPane* pane = mB30[i].pane; + pane->rotate(mB30[i].mSize.x / 2.0f, mB30[i].mSize.y / 2.0f, ROTATE_Z, pane->getRotate()); } cursorScale();