mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-07-08 13:56:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixup rebase

Browse Source
This commit is contained in:
elijah-thomas774
2025-11-22 15:09:13 -05:00
parent 0f3aad940e
commit 8a9d164384
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/obj/d_a_obj_barrel.h
+2 -2
View File
@@ -161,8 +161,8 @@ private:
/* 0xC7C */ TimeAreaStruct mTimeArea;
/* 0xC88 */ dAcRef_c<dAcNpcCeLady_c> mCeLady;
/* 0xC94 */ dAcRef_c<dAcNpcCeFriend_c> mCeFriend;
/* 0xCA0 */ EffectsStruct mEmitter0;
/* 0xCD4 */ EffectsStruct mEmitter1;
/* 0xCA0 */ dEmitter_c mEmitter0;
/* 0xCD4 */ dEmitter_c mEmitter1;
/* 0xD08 */ dWaterEffect_c mWaterEffect;
/* 0xD50 */ mQuat_c quat_0xD50;
/* 0xD60 */ mQuat_c quat_0xD60;
include/m/m_angle.h
-3
View File
@@ -36,9 +36,6 @@ struct mAng {
void set(s16 val) {
mVal = val;
}
void setF(const f32 &val) {
mVal = val;
}
s16 *ref() {
return &mVal;
src/REL/d/a/obj/d_a_obj_barrel.cpp
+2 -2
View File
@@ -1433,8 +1433,8 @@ void dAcOBarrel_c::fn_293_5910() {
return;
}
mEmitter0.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_515_, mPosition, nullptr, &scale, nullptr, nullptr);
mEmitter1.createContinuousEffect(PARTICLE_RESOURCE_ID_MAPPING_516_, mPosition, nullptr, &scale, nullptr, nullptr);
mEmitter0.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_515_, mPosition, nullptr, &scale, nullptr, nullptr);
mEmitter1.holdEffect(PARTICLE_RESOURCE_ID_MAPPING_516_, mPosition, nullptr, &scale, nullptr, nullptr);
}
struct T {
src/d/lyt/d_lyt_map_markers.cpp
+3 -3
View File
@@ -897,9 +897,9 @@ void dLytMapIcon01_c::draw() {
mVec3_c rotate(0.0f, 0.0f, 0.0f);
if (dLytMapGlobal_c::GetInstance()->getField_0x55() != 0) {
dAcPy_c *link = getLinkPtr();
rotate.z = (link->vt_0x19C() + link->mRotation.y + (-mapRot)).degree2();
rotate.z = mAng(link->mRotation.y + link->vt_0x19C() + -mapRot).degree2();
} else {
rotate.z = (field_0x0D3A + (-mapRot)).degree2();
rotate.z = mAng(field_0x0D3A + -mapRot).degree2();
}
pane->SetRotate(rotate);
pane = pane->GetParent();
@@ -907,7 +907,7 @@ void dLytMapIcon01_c::draw() {
}
case MAP_ICON_01_PANE_DOOR_000:
case MAP_ICON_01_PANE_START_000: {
mVec3_c rotate(0.0f, 0.0f, ((-mapRot) + commandRot).degree2());
mVec3_c rotate(0.0f, 0.0f, mAng(-mapRot + commandRot).degree2());
pane->SetRotate(rotate);
pane = mpPanes[paneIdx]->GetParent();
break;