summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/SSystem/SComponent/c_m3d_g_lin.h7
-rw-r--r--include/d/actor/d_a_windmill.h5
2 files changed, 7 insertions, 5 deletions
diff --git a/include/SSystem/SComponent/c_m3d_g_lin.h b/include/SSystem/SComponent/c_m3d_g_lin.h
index f0571acc..1f85cac8 100644
--- a/include/SSystem/SComponent/c_m3d_g_lin.h
+++ b/include/SSystem/SComponent/c_m3d_g_lin.h
@@ -20,12 +20,11 @@ public:
mEnd = end;
}
void SetStartEnd(const Vec& start, const Vec& end) {
- mStart = start;
- mEnd = end;
+ mStart.set(start);
+ mEnd.set(end);
}
void set(const Vec& start, const Vec& end) {
- mStart = start;
- mEnd = end;
+ SetStartEnd(start, end);
}
void CalcPos(Vec* out, f32 scale) const {
Vec tmp;
diff --git a/include/d/actor/d_a_windmill.h b/include/d/actor/d_a_windmill.h
index bbd4909d..59466b16 100644
--- a/include/d/actor/d_a_windmill.h
+++ b/include/d/actor/d_a_windmill.h
@@ -4,6 +4,7 @@
#include "f_op/f_op_actor.h"
#include "d/d_cc_d.h"
#include "SSystem/SComponent/c_phase.h"
+#include "f_op/f_op_actor_mng.h"
class dBgW;
@@ -49,6 +50,8 @@ public:
/* 0x1420 */ u32 mWindTagId;
};
-STATIC_ASSERT(sizeof(daWindMill_c) == 0x1424);
+namespace daWindMill_prm {
+ inline u8 getType(daWindMill_c* i_this) { return fopAcM_GetParam(i_this) & 0xF; }
+};
#endif /* D_A_WINDMILL_H */