mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-16 12:45:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Misc small cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-04-09 01:49:35 -04:00
parent 2ae6d899f7
commit 556e578f23
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_fganon.cpp
+2 -2
View File
@@ -1924,7 +1924,7 @@ void demo_camera(fganon_class* i_this) {
player->changeOriginalDemo();
camera2 = g_dComIfG_gameInfo.play.mCameraInfo[0].mpCamera;
camera2 = dComIfGp_getCamera(0);
i_this->mB5C = camera2->mLookat.mEye;
i_this->mB68 = camera2->mLookat.mCenter;
@@ -2497,7 +2497,7 @@ static BOOL daFganon_Execute(fganon_class* i_this) {
i_this->m684 = 0;
i_this->mWeponSph.SetC(local_84);
}
g_dComIfG_gameInfo.play.mCcS.Set(&i_this->mWeponSph);
dComIfG_Ccsp()->Set(&i_this->mWeponSph);
i_this->m686 = 0;
mant_class* cape = (mant_class*)fopAcM_SearchByID(i_this->mCapeID);
if (cape != NULL) {
src/d/actor/d_a_ship.cpp
+1 -3
View File
@@ -1849,7 +1849,6 @@ BOOL daShip_c::procCrane() {
return TRUE;
}
setControllAngle(0);
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (!dComIfGp_event_runCheck() && !daPy_getPlayerLinkActorClass()->checkNoControll()) {
if (m0398 == m039A) {
if(std::fabsf(speedF) < 3.0f &&
@@ -1867,8 +1866,7 @@ BOOL daShip_c::procCrane() {
setControllAngle(-0xA00);
}
if (m0353 && (sVar1 != mCurrentRopeSegmentIndex)) {
//dComIfGp_getVibration().StartShock(5, -0x31, cXyz(0.0f, 1.0f, 0.0f));
play->getVibration().StartShock(5, -0x31, cXyz(0.0f, 1.0f, 0.0f)); //Fakematch
dComIfGp_getVibration().StartShock(5, -0x31, cXyz(0.0f, 1.0f, 0.0f));
}
}
else if (m039A > 0) {
src/d/actor/d_a_tbox.cpp
+2 -7
View File
@@ -1233,11 +1233,7 @@ static s32 daTbox_IsDelete(daTbox_c*) {
/* 00002FD8-00003070 .text daTbox_Delete__FP8daTbox_c */
static s32 daTbox_Delete(daTbox_c* i_tbox) {
if (i_tbox->mpBgWCurrent != NULL) {
dComIfG_Bgsp()->Release(i_tbox->mpBgWCurrent);
}
i_tbox->mSmokeCB.end();
i_tbox->deleteProc();
dComIfG_resDelete(i_tbox->getPhase(), "Dalways");
if (l_HIO.mNo >= 0) {
@@ -1265,11 +1261,10 @@ static cPhs_State daTbox_Create(fopAc_ac_c* i_actor) {
};
daTbox_c* tbox = static_cast<daTbox_c*>(i_actor);
s32 result;
fopAcM_SetupActor(tbox, daTbox_c);
result = dComIfG_resLoad(tbox->getPhase(), "Dalways");
cPhs_State result = dComIfG_resLoad(tbox->getPhase(), "Dalways");
if (result == cPhs_COMPLEATE_e) {
tbox->mRoomNo = tbox->home.angle.x & 0x3F;