mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-06-02 10:10:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix all_source build

Browse Source
This commit is contained in:
Luke Street
2024-06-18 18:41:15 -06:00
parent edc086c39d
commit cf8b14e1ec
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/REL/d/a/d_a_t_wood_area.cpp
+2 -2
View File
@@ -110,8 +110,8 @@ void dAcTWoodArea_c::executeState_Wait() {
if (dist.x * dist.x + dist.z * dist.z < attachRadius) {
bool someEffectThing = subtype != 1 ? (params & 0xF) != 0 ? false : true : true;
if (someEffectThing) {
fn_800298B0(PARTICLE_RESOURCE_ID_MAPPING[8],
&mVec3_c(position.x, position.y + getAttachHeight(), position.z), nullptr, 0, 0, 0, 0, 0);
mVec3_c tmp(position.x, position.y + getAttachHeight(), position.z);
fn_800298B0(PARTICLE_RESOURCE_ID_MAPPING[8], &tmp, nullptr, 0, 0, 0, 0, 0);
}
dropItems();
}
src/d/a/d_a_base.cpp
+2 -2
View File
@@ -370,8 +370,8 @@ bool dAcBase_c::getDistanceAndAngleToActor(dAcBase_c *actor, f32 distThresh, s16
angleToActorY = targetAngleY(&position, &actor->position);
angleToActorX = targetAngleX(&position, &actor->position);
if ((distSquared <= distThresh * distThresh) && (doAbs(s32(rotation.y - angleToActorY)) <= yAngle) &&
(doAbs(s32(rotation.x - angleToActorX)) <= xAngle)) {
if ((distSquared <= distThresh * distThresh) && (doAbs(s32(rotation.y.mVal - angleToActorY)) <= yAngle) &&
(doAbs(s32(rotation.x.mVal - angleToActorX)) <= xAngle)) {
isWithinRange = true;
}
}
src/toBeSorted/special_item_drop_mgr.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ bool spawnSpecialDropItem(SpecialItemDropMgr *mgr, int specialItemId, int roomid
s16 currentRot;
s16 tempOther;
u16 itemid = SPECIAL_ITEM_ARRAY[unk];
mAng3_c itemRot = {0, 0, 0};
mAng3_c itemRot(0, 0, 0);
if (subtype == 2 || subtype == 6) {
currentRot = *rot;