Introduce CDTYPE constants and rename some symbols relating to collision detection

This commit is contained in:
Ryan Dwyer
2021-01-13 17:31:36 +10:00
parent 8c3f6e22e0
commit aaec2853bd
16 changed files with 180 additions and 162 deletions
+7 -7
View File
@@ -7,13 +7,13 @@ void currentPlayerWalkInit(void);
void currentPlayerSetSwayTarget(s32 value);
void currentPlayerAdjustCrouchPos(s32 value);
void func0f0c3b38(struct coord *param_1, struct defaultobj *obj);
bool currentPlayerHasGapToCeiling(f32 y);
s32 bwalkTryMoveUpwards(f32 amount);
bool bwalkCalculateNewPosition(struct coord *vel, f32 rotateamount, bool apply, f32 extrawidth, s32 arg4);
bool func0f0c4250(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 arg4);
s32 func0f0c4764(struct coord *delta, struct coord *arg1, struct coord *arg2, s32 arg3);
s32 func0f0c47d0(struct coord *a, struct coord *b, struct coord *c, struct coord *d, struct coord *e, s32 arg6);
s32 func0f0c494c(struct coord *a, struct coord *b, struct coord *c, s32 arg3);
s32 func0f0c4a5c(struct coord *a, struct coord *b, struct coord *c, s32 arg3);
bool func0f0c4250(struct coord *delta, f32 rotateamount, bool apply, f32 extrawidth, s32 types);
s32 func0f0c4764(struct coord *delta, struct coord *arg1, struct coord *arg2, s32 types);
s32 func0f0c47d0(struct coord *a, struct coord *b, struct coord *c, struct coord *d, struct coord *e, s32 types);
s32 func0f0c494c(struct coord *a, struct coord *b, struct coord *c, s32 types);
s32 func0f0c4a5c(struct coord *a, struct coord *b, struct coord *c, s32 types);
void func0f0c4d98(void);
void currentPlayerUpdateSpeedSidewaysWalk(f32 targetspeed, f32 accelspeed, s32 mult);
void currentPlayerUpdateSpeedForwardsWalk(f32 targetspeed, f32 accelspeed);
@@ -22,7 +22,7 @@ void currentPlayerApplyCrouchSpeed(void);
void currentPlayerUpdateCrouchOffsetWalk(void);
void func0f0c6180(void);
void func0f0c6318(void);
void func0f0c63bc(struct coord *arg0, u32 arg1, s32 arg2);
void func0f0c63bc(struct coord *arg0, u32 arg1, s32 types);
void currentPlayerUpdatePrevPosWalk(void);
void func0f0c65a8(void);
void currentPlayerUpdateSpeedWalk(struct movedata *data);
+1 -1
View File
@@ -56,7 +56,7 @@ u32 func0f034410(void);
u32 func0f034480(void);
void func0f034524(struct chrdata *chr, f32 arg1, struct coord *vector, u8 *arg3, struct prop *prop, u32 arg5, u32 arg6, struct prop *prop2, u32 arg8, u32 arg9, u32 arg10, u32 arg11, u32 arg12, u32 arg13);
u32 func0f03645c(void);
bool func0f03654c(struct chrdata *chr, struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2, struct coord *vector, f32 arg6, u32 arg7);
bool func0f03654c(struct chrdata *chr, struct coord *pos, s16 *rooms, struct coord *pos2, s16 *rooms2, struct coord *vector, f32 arg6, u32 types);
bool propchrHasClearLineToPos(struct prop *prop, struct coord *dstpos, struct coord *vector);
bool propchrHasClearLineInVector(struct prop *prop, struct coord *coord, f32 arg2);
bool func0f036974(struct prop *prop, struct coord *coord);