diff --git a/configure.py b/configure.py index 6b67a2391..285cc1d26 100755 --- a/configure.py +++ b/configure.py @@ -1677,7 +1677,7 @@ config.libs = [ ActorRel(NonMatching, "d_a_obj_gtaki"), ActorRel(NonMatching, "d_a_obj_hami2"), ActorRel(NonMatching, "d_a_obj_hami3"), - ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_obj_hami4"), + ActorRel(Matching, "d_a_obj_hami4"), ActorRel(Equivalent, "d_a_obj_hat"), # weak func order ActorRel(Matching, "d_a_obj_hbrf1"), ActorRel(NonMatching, "d_a_obj_hcbh"), diff --git a/src/d/actor/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp index 10fdfb25a..5d17a2401 100644 --- a/src/d/actor/d_a_obj_hami4.cpp +++ b/src/d/actor/d_a_obj_hami4.cpp @@ -100,12 +100,13 @@ void daObjHami4_c::daObjHami4_open_demo_wait() { /* 00000714-000007AC .text daObjHami4_open_demo__12daObjHami4_cFv */ void daObjHami4_c::daObjHami4_open_demo() { - field_0x37C += 10; if (field_0x37C >= 1500.0f) { field_0x37C = 1500.0f; field_0x378 = 3; +#if VERSION > VERSION_DEMO dComIfGp_getVibration().StartShock(4,-0x21,cXyz(0.0f, 1.0f, 0.0f)); +#endif dComIfGp_event_reset(); } }