summaryrefslogtreecommitdiff
path: root/src/d/actor/d_a_obj_coming.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2026-04-17 12:55:19 -0400
committerLagoLunatic <LagoLunatic@users.noreply.github.com>2026-04-17 12:55:19 -0400
commit51bb7d81309aba335a4e5e85af79bf4b506db989 (patch)
tree22b5541c0ed76ad372e21d523c6b31a0f51f5b36 /src/d/actor/d_a_obj_coming.cpp
parent98dc2807e66156d73e2e2db52440861f2580dacb (diff)
d_a_obj_coming OK, d_a_coming2 OK
The barrel2 make_prm params were swapped around, making it seem impossible to match.
Diffstat (limited to 'src/d/actor/d_a_obj_coming.cpp')
-rw-r--r--src/d/actor/d_a_obj_coming.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp
index 7e03ba76..683df90d 100644
--- a/src/d/actor/d_a_obj_coming.cpp
+++ b/src/d/actor/d_a_obj_coming.cpp
@@ -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;