Rebase fixes

2 files changed, 7 insertions, 7 deletions

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) {