Decompile fanTick

This commit is contained in:
Ryan Dwyer
2020-06-09 17:02:43 +10:00
parent d928fd81ec
commit d3a2a7e8f2
13 changed files with 93 additions and 166 deletions
+1 -1
View File
@@ -2051,7 +2051,7 @@
#define OBJTYPE_HOVERBIKE 0x33
#define OBJTYPE_END 0x34
#define OBJTYPE_HOVERPROP 0x35
#define OBJTYPE_VENTFAN 0x36
#define OBJTYPE_FAN 0x36
#define OBJTYPE_HOVERCAR 0x37
#define OBJTYPE_PADEFFECT 0x38
#define OBJTYPE_CHOPPER 0x39
+2 -2
View File
@@ -155,8 +155,8 @@ u32 func0f077c10(void);
u32 func0f078094(void);
void cameraTick(struct prop *camera);
u32 func0f078930(void);
void ventfanTick(struct prop *ventfan);
void func0f078be0(struct prop *ventfan);
void fanTick(struct prop *fan);
void func0f078be0(struct prop *fan);
void autogunTick(struct prop *autogun);
u32 func0f079ca4(void);
void func0f079f1c(struct prop *autogun);
+1 -1
View File
@@ -261,7 +261,7 @@
u28, u29, u30, u31, \
u32, u33, u34, u35,
#define vent_fan(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25) \
#define fan(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23, u24, u25) \
_generic_object(0x36, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
u20, u21, u22, u23, \
u24, u25,
+10
View File
@@ -1119,6 +1119,16 @@ struct hoverpropobj { // objtype 35
struct hov hov;
};
struct fanobj { // objtype 36
struct defaultobj base;
/*0x5c*/ f32 yrot;
/*0x60*/ f32 yrotprev;
/*0x64*/ f32 ymaxspeed;
/*0x68*/ f32 yspeed;
/*0x6c*/ f32 yaccel;
/*0x70*/ s8 on;
};
struct hovercarobj {
struct defaultobj base;
/*0x5c*/ u8 *ailist;