mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-23 15:01:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rebase fixes

Browse Source
This commit is contained in:
robojumper
2026-03-01 21:05:31 +01:00
parent 1ec9c01b83
commit 43ec1eaa35
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_camera.h
+1 -1
View File
@@ -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;
src/REL/d/a/b/d_a_b_lastboss.cpp
+6 -6
View File
@@ -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 {
src/REL/d/a/obj/d_a_obj_soil.cpp
+1 -1
View File
@@ -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) {
src/d/tg/d_t_mass_object.cpp
+3 -3
View File
@@ -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);