diff --git a/include/d/d_camera.h b/include/d/d_camera.h index 50a86f1d..06f1308d 100644 --- a/include/d/d_camera.h +++ b/include/d/d_camera.h @@ -127,7 +127,7 @@ public: bool isUnderwater() const; f32 getUnderwaterDepth() const; - void fn_8019EA70(bool); + bool fn_8019EA70(bool); bool setEventCamView(const mVec3_c &, const mVec3_c &, f32, f32); mAng getYAngle() const; mAng getXZAngle() const; diff --git a/src/REL/d/a/b/d_a_b_lastboss.cpp b/src/REL/d/a/b/d_a_b_lastboss.cpp index fd5656b9..d6a115c3 100644 --- a/src/REL/d/a/b/d_a_b_lastboss.cpp +++ b/src/REL/d/a/b/d_a_b_lastboss.cpp @@ -3095,12 +3095,12 @@ void dAcBlastboss_c::executeLightningStrike() { field_0x2CFC = 60.0f; mLightingStrikeState = LIGHTNING_STRIKE_DEMO; // huh - field_0x2D10.x = cam->getField_0x78().x; - field_0x2D10.y = cam->getField_0x78().y; - field_0x2D10.z = cam->getField_0x78().z; - field_0x2D04.x = cam->getPositionMaybe().x; - field_0x2D04.y = cam->getPositionMaybe().y; - field_0x2D04.z = cam->getPositionMaybe().z; + field_0x2D10.x = cam->getTarget().x; + field_0x2D10.y = cam->getTarget().y; + field_0x2D10.z = cam->getTarget().z; + field_0x2D04.x = cam->getPosition().x; + field_0x2D04.y = cam->getPosition().y; + field_0x2D04.z = cam->getPosition().z; mIsPhaseTwo = -1; // fall-through } else { diff --git a/src/REL/d/a/obj/d_a_obj_soil.cpp b/src/REL/d/a/obj/d_a_obj_soil.cpp index a6e582be..15b1dc78 100644 --- a/src/REL/d/a/obj/d_a_obj_soil.cpp +++ b/src/REL/d/a/obj/d_a_obj_soil.cpp @@ -570,7 +570,7 @@ void dAcOsoil_c::handleModelsOpacities() { if (dAcPy_c::LINK->mPosition.squareDistance(mPosition) < 1000000.f) { dCamera_c* camera = dScGame_c::getCamera(); if (camera != nullptr) { - f32 dist = (camera->getPositionMaybe() - mPosition).y * (1.f / 80.f); + f32 dist = (camera->getPosition() - mPosition).y * (1.f / 80.f); if (dist < 0.1f) { dist = 0.f; } else if (dist > 1) { diff --git a/src/d/tg/d_t_mass_object.cpp b/src/d/tg/d_t_mass_object.cpp index 15cc73b2..6c58db5b 100644 --- a/src/d/tg/d_t_mass_object.cpp +++ b/src/d/tg/d_t_mass_object.cpp @@ -1056,12 +1056,12 @@ bool dTgMassObjInstance::checkForHit( param_5->mCutCounter++; mVec3_c local16C(mGroundHeight.x, mGroundHeight.y, mGroundHeight.z); mColor local17C = 0xFFFFFFFF; - f32 camField2A8 = dScGame_c::getCamera()->getField_0x2A8(); + f32 waterHeight = dScGame_c::getCamera()->getWaterHeight(); local17C.r = mTevColor.r; local17C.g = mTevColor.g; local17C.b = mTevColor.b; local17C.a = mTevColor.a; - if (local16C.y + 100.f < camField2A8 && mMassObjSubtype <= 5) { + if (local16C.y + 100.f < waterHeight && mMassObjSubtype <= 5) { if (dScGame_c::isCurrentStage("D100")) { mMassObjSubtype = 6; } else { @@ -1424,7 +1424,7 @@ extern void LoadMaterial( ); void GrassModelData::draw(f32 param_1, f32 param_2, nw4r::math::MTX34 *pMtx) { - mVec3_c cameraPosition = dScGame_c::getCamera()->getPositionMaybe(); + mVec3_c cameraPosition = dScGame_c::getCamera()->getPosition(); bool isInFaronWoods = dScGame_c::isCurrentStage("F100"); nw4r::g3d::ResMatMisc miscData(mResMat.GetResMatMisc()); miscData.SetLightSetIdx(1);