diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/obj/d_a_obj_tumble_weed.h | 2 | ||||
| -rw-r--r-- | include/d/t/d_t_tumble_weed.h | 3 | ||||
| -rw-r--r-- | include/s/s_State.hpp | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/d/a/obj/d_a_obj_tumble_weed.h b/include/d/a/obj/d_a_obj_tumble_weed.h index e87012ad..a449b1c5 100644 --- a/include/d/a/obj/d_a_obj_tumble_weed.h +++ b/include/d/a/obj/d_a_obj_tumble_weed.h @@ -59,6 +59,8 @@ public: STATE_FUNC_DECLARE(dAcOTumbleWeed_c, Wait); STATE_FUNC_DECLARE(dAcOTumbleWeed_c, Slope); + STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dTgTumbleWeed_c); + private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mMdl; diff --git a/include/d/t/d_t_tumble_weed.h b/include/d/t/d_t_tumble_weed.h index 85fb4193..0b51027d 100644 --- a/include/d/t/d_t_tumble_weed.h +++ b/include/d/t/d_t_tumble_weed.h @@ -18,6 +18,8 @@ public: STATE_FUNC_DECLARE(dTgTumbleWeed_c, AreaIn); STATE_FUNC_DECLARE(dTgTumbleWeed_c, Wind); + STATE_MGR_DEFINE_UTIL_EXECUTESTATE(dTgTumbleWeed_c); + private: bool shouldSpawnTumbleweed(); bool shouldDoWind(); @@ -25,6 +27,7 @@ private: void getWind(mVec3_c &); STATE_MGR_DECLARE(dTgTumbleWeed_c); + u16 mSpawnTimer; u16 padding; u16 mWindTimer; diff --git a/include/s/s_State.hpp b/include/s/s_State.hpp index d461f630..807a1bd9 100644 --- a/include/s/s_State.hpp +++ b/include/s/s_State.hpp @@ -38,6 +38,10 @@ void changeState(const sStateIDIf_c &value) { \ mStateMgr.changeState(value); \ } +#define STATE_MGR_DEFINE_UTIL_EXECUTESTATE(class_name) \ + void executeState() { \ + mStateMgr.executeState(); \ + } #define STATE_MGR_DEFINE_UTIL_ISSTATE(class_name) \ bool isState(const sFStateID_c<class_name> &value) const { \ |