mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-06 03:28:56 -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
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);