mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-09 10:32:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Set names for act_anim struct and CHRANIMFLAG constants

Browse Source
This commit is contained in:
Ryan Dwyer
2021-05-25 12:05:54 +10:00
parent bcfc7236c6
commit 9d86b1556d
31 changed files with 594 additions and 590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/commands.h
+4 -4
View File
@@ -122,15 +122,15 @@
*
* endframe may be 0 or higher for that frame number, or -1 for the last frame.
*
* flags is expected to be a CHRANIMFLAG constant.
* chranimflags is expected to be a CHRANIMFLAG constant.
*/
#define chr_do_animation(animation, startframe, endframe, flags, transition, chr, animspeed) \
#define chr_do_animation(animation, startframe, endframe, chranimflags, timemerge, chr, animspeed) \
mkshort(0x000b), \
mkshort(animation), \
mkshort(startframe), \
mkshort(endframe), \
flags, \
transition, \
chranimflags, \
timemerge, \
chr, \
animspeed,
src/include/constants.h
+6 -6
View File
@@ -432,12 +432,12 @@
#define CHR_SELF 0xfd
#define CHRANIMFLAG_FLIP 0x01
#define CHRANIMFLAG_02 0x02
#define CHRANIMFLAG_HOLDLASTFRAME 0x04
#define CHRANIMFLAG_08 0x08
#define CHRANIMFLAG_10 0x10
#define CHRANIMFLAG_40 0x40
#define CHRANIMFLAG_80 0x80
#define CHRANIMFLAG_MOVEWHENINVIS 0x02
#define CHRANIMFLAG_PAUSEATEND 0x04
#define CHRANIMFLAG_COMPLETED 0x08
#define CHRANIMFLAG_SLOWUPDATE 0x10
#define CHRANIMFLAG_LOCKPOS 0x40
#define CHRANIMFLAG_REVERSE 0x80
// chr->flags
#define CHRFLAG0_CANT_ALERT_GROUP 0x00000001 // Don't set group alertness when becoming aware
src/include/game/chr/chraction.h
+4 -4
View File
@@ -45,7 +45,7 @@ void chrAttackWalkChooseAnimation(struct chrdata *chr);
void chrAttackWalk(struct chrdata *chr, bool run);
void chrAttackRollChooseAnimation(struct chrdata *chr);
void chrAttackRoll(struct chrdata *chr, bool toleft);
void chrStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 flags, s32 arg5, f32 speed);
void chrStartAnim(struct chrdata *chr, s32 animnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed);
void func0f031254(struct chrdata *chr);
void chrAttack(struct chrdata *chr, struct attackanimgroup **animgroups, bool flip, bool *firing, u32 attackflags, s32 entityid, bool standing);
void chrAttackAmount(struct chrdata *chr, u32 attackflags, u32 entityid, u32 maxshots);
@@ -116,8 +116,8 @@ s32 func0f03aca0(struct chrdata *chr, f32 arg1, u8 arg2);
bool chrTryRunFromTarget(struct chrdata *chr);
u32 func0f03b1e0(struct chrdata *chr);
bool chrDropItem(struct chrdata *chr, u32 modelnum, u32 weaponnum);
void chrPunchInflictDamage(struct chrdata *chr, s32 arg1, s32 arg2, u8 arg3);
bool chrTryPunchOrKick(struct chrdata *chr, u32 arg1);
void chrPunchInflictDamage(struct chrdata *chr, s32 damage, s32 range, u8 reverse);
bool chrTryPunchOrKick(struct chrdata *chr, bool reverse);
struct eyespy *chrToEyespy(struct chrdata *chr);
void chrTickStand(struct chrdata *chr);
void chrTickAnim(struct chrdata *chr);
@@ -264,7 +264,7 @@ bool chrTrySurprisedOneHand(struct chrdata *chr);
bool chrTrySurprisedSurrender(struct chrdata *chr);
bool chrTrySurprisedLookAround(struct chrdata *chr);
bool chrTryKneel(struct chrdata *chr);
bool chrTryStartAnim(struct chrdata *chr, s32 animfnum, f32 startframe, f32 endframe, u8 flags, s32 arg5, f32 speed);
bool chrTryStartAnim(struct chrdata *chr, s32 animfnum, f32 startframe, f32 endframe, u8 chranimflags, s32 merge, f32 speed);
bool chrTryStartAlarm(struct chrdata *chr, s32 pad_id);
s32 chrConsiderGrenadeThrow(struct chrdata *chr, u32 attackflags, u32 entityid);
void chrTickKneel(struct chrdata *chr);
src/include/lib/model.h
+4 -4
View File
@@ -58,11 +58,11 @@ s32 modelGetNumAnimFrames(struct model *model);
f32 modelGetAnimSpeed(struct model *model);
f32 modelGetAbsAnimSpeed(struct model *model);
s32 modelConstrainOrWrapAnimFrame(s32 frame, s16 animnum, f32 endframe);
void modelCopyAnimForMerge(struct model *model, f32 arg1);
void func0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 arg5);
void modelCopyAnimForMerge(struct model *model, f32 merge);
void func0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
bool modelIsAnimMerging(struct model *model);
void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 arg5, bool merge);
void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 arg5);
void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 timemerge, bool domerge);
void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
void modelCopyAnimData(struct model *src, struct model *dst);
void modelSetAnimLooping(struct model *model, f32 loopframe, f32 loopmerge);
void modelSetAnimEndFrame(struct model *model, f32 endframe);
src/include/types.h
+11 -11
View File
@@ -1016,22 +1016,22 @@ struct act_stand {
};
struct act_anim {
/*0x2c*/ u32 unk02c;
/*0x30*/ bool holdlastframe;
/*0x34*/ u32 unk034;
/*0x38*/ u32 unk038;
/*0x3c*/ u32 unk03c;
/*0x40*/ u8 unk040;
/*0x41*/ u8 unk041;
/*0x42*/ u16 unk042;
/*0x44*/ u16 unk044;
/*0x46*/ u16 unk046;
/*0x2c*/ bool movewheninvis;
/*0x30*/ bool pauseatend;
/*0x34*/ bool completed;
/*0x38*/ bool slowupdate;
/*0x3c*/ bool lockpos;
/*0x40*/ u8 ishitanim;
/*0x41*/ u8 reverse;
/*0x42*/ u16 hitframe;
/*0x44*/ u16 hitdamage;
/*0x46*/ u16 hitradius;
/*0x48*/ s16 animnum;
/*0x4a*/ u8 flip;
/*0x4c*/ f32 startframe;
/*0x50*/ f32 endframe;
/*0x54*/ f32 speed;
/*0x58*/ f32 unk058;
/*0x58*/ f32 blend;
};
struct act_die {