mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-18 05:08:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_coming OK, d_a_coming2 OK

Browse Source 
The barrel2 make_prm params were swapped around, making it seem impossible to match.
This commit is contained in:
LagoLunatic
2026-04-17 12:55:19 -04:00
parent 98dc2807e6
commit 51bb7d8130
6 changed files with 83 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_coming.cpp
+3 -3
View File
@@ -441,7 +441,7 @@ void daObjComing::Act_c::mode_barrel2_wait(daObjComing::Ctrl_c* ctrl) {
barrel2.mItem,
barrel2.m14,
barrel2.mAngleY,
daObjBuoyflag::Texture_01_e
daObjBuoyflag::Texture_00_e
);
ctrl->set_appear_timer(this);
ctrl->m00 = 1;
@@ -463,7 +463,7 @@ void daObjComing::Act_c::mode_barrel2_appear(daObjComing::Ctrl_c* ctrl) {
if (ac != NULL) {
daObjBarrel2::Act_c* barrel2_act = (daObjBarrel2::Act_c*)ac;
JUT_ASSERT(1119, fopAcM_GetName(barrel2_act) == tk_Obj_Barrel2_e);
barrel2_act->m474 = 1;
barrel2_act->exit_req();
}
} else {
ctrl->m08 = fpcM_ERROR_PROCESS_ID_e;
@@ -487,7 +487,7 @@ void daObjComing::Act_c::mode_barrel2_leave(daObjComing::Ctrl_c* ctrl) {
if (ac != NULL) {
daObjBarrel2::Act_c* barrel2_act = (daObjBarrel2::Act_c*)ac;
JUT_ASSERT(1145, fopAcM_GetName(barrel2_act) == tk_Obj_Barrel2_e);
barrel2_act->m474 = 1;
barrel2_act->exit_req();
}
} else {
ctrl->m08 = fpcM_ERROR_PROCESS_ID_e;