mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-23 06:54:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

link d_t_tumble_weed

Browse Source
This commit is contained in:
elijah-thomas774
2025-11-28 06:09:05 -05:00
parent cffef6c1b7
commit 974aca3d05
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+1 -1
View File
@@ -2966,7 +2966,7 @@ config.libs = [
Rel(Matching, "d_t_time_area_check", "REL/d/t/d_t_time_area_check.cpp"),
Rel(Matching, "d_t_time_door_beam", "REL/d/t/d_t_time_door_beam.cpp"),
Rel(Matching, "d_t_touch", "REL/d/t/d_t_touch.cpp"),
Rel(NonMatching, "d_t_tumble_weed", "REL/d/t/d_t_tumble_weed.cpp"),
Rel(Matching, "d_t_tumble_weed", "REL/d/t/d_t_tumble_weed.cpp"),
]
include/d/a/obj/d_a_obj_tumble_weed.h
+2
View File
@@ -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;
include/d/t/d_t_tumble_weed.h
+3
View File
@@ -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;
include/s/s_State.hpp
+4
View File
@@ -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 { \