Decompile playerTick

This commit is contained in:
Ryan Dwyer
2021-06-01 20:11:46 +10:00
parent 5d4decdba0
commit f6efddef20
9 changed files with 232 additions and 1032 deletions
+2 -1
View File
@@ -519,7 +519,7 @@
#define CHRHFLAG_00000100 0x00000100 // Not used in scripts
#define CHRHFLAG_00000200 0x00000200 // Not used in scripts
#define CHRHFLAG_PASSIVE 0x00000400
#define CHRHFLAG_KEEP_CORPSE 0x00000800 // Appears to be misnamed
#define CHRHFLAG_00000800 0x00000800
#define CHRHFLAG_UNTARGETABLE 0x00001000
#define CHRHFLAG_00002000 0x00002000 // Globals, Rescue guards once disguised
#define CHRHFLAG_TRIGGER_BUDDY_WARP 0x00004000
@@ -544,6 +544,7 @@
// chr->hidden2
#define CHRH2FLAG_0001 0x0001
#define CHRH2FLAG_0002 0x0002 // Equivalent to OBJFLAG3_00020000
#define CHRH2FLAG_0004 0x0004
#define CHRH2FLAG_BLUESIGHT 0x0008
#define CHRH2FLAG_TICKDURINGAUTOCUT 0x0010
#define CHRH2FLAG_0040 0x0040
+1 -1
View File
@@ -140,7 +140,7 @@ f32 chrGetAimAngle(struct chrdata *chr);
f32 func0f03e754(struct chrdata *chr);
s32 func0f03e788(struct chrdata *chr, s32 turning, f32 arg2, f32 arg3, f32 arg4);
bool func0f03e9f4(struct chrdata *chr, struct attackanimconfig *animcfg, s32 arg2, s32 arg3, f32 arg4);
u32 func0f03f778(void);
void func0f03f778(struct chrdata *chr, struct attackanimconfig *animcfg, bool hasleftgun, bool hasrightgun, f32 shootrotx);
f32 chrGetAimLimitAngle(f32 sqdist);
void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gset *gset);
bool func0f03fde4(struct chrdata *chr, s32 handnum, struct coord *arg2);
+1 -1
View File
@@ -77,7 +77,7 @@ void currentPlayerSetShieldFrac(f32 frac);
s32 getMissionTime(void);
s32 playerTickBeams(struct prop *prop);
s32 playerTick(struct prop *prop);
void func0f0c2a58(struct chrdata *chr, s32 crouchpos, f32 arg2, f32 arg3, f32 arg4, f32 *arg5, struct attackanimconfig **arg6);
void func0f0c2a58(struct chrdata *chr, s32 crouchpos, f32 speedsideways, f32 speedforwards, f32 speedtheta, f32 *angleoffset, struct attackanimconfig **animcfg);
Gfx *playerRender(struct prop *prop, Gfx *gdl, bool withalpha);
Gfx *currentPlayerLoadMatrix(Gfx *gdl);
void func0f0c3320(Mtxf *matrices, s32 count);
+10 -11
View File
@@ -874,8 +874,8 @@ struct aibot {
/*0x09d*/ u8 unk09d;
/*0x0a0*/ s32 unk0a0;
/*0x0a4*/ f32 unk0a4;
/*0x0a8*/ f32 unk0a8;
/*0x0ac*/ f32 unk0ac;
/*0x0a8*/ f32 angleoffset;
/*0x0ac*/ f32 speedtheta;
/*0x0b0*/ f32 unk0b0; // likely to be the turn angle to 360 degrees, in radians
/*0x0b4*/ f32 unk0b4;
/*0x0b8*/ f32 unk0b8;
@@ -1201,6 +1201,10 @@ struct act_throwgrenade {
/*0x38*/ bool needsequip;
};
struct act_bondmulti {
/*0x2c*/ struct attackanimconfig *animcfg;
};
struct act_druggedcomingup {
/*0x2c*/ s16 timer60;
};
@@ -1268,6 +1272,7 @@ struct chrdata {
struct act_gopos act_gopos;
struct act_surprised act_surprised;
struct act_throwgrenade act_throwgrenade;
struct act_bondmulti act_bondmulti;
// act_bot_attackstand uses act_attack
// act_bot_attackkneel uses act_attack
// act_bot_attackstrafe uses act_attack
@@ -2507,7 +2512,7 @@ struct player {
/*0x00c8*/ s32 badrockettime;
/*0x00cc*/ u32 gunspeed;
/*0x00d0*/ s32 bondactivateorreload;
/*0x00d4*/ u32 unk00d4;
/*0x00d4*/ struct model *model00d4;
/*0x00d8*/ bool isdead;
/*0x00dc*/ f32 bondhealth; // frac (range 0-1)
/*0x00e0*/ struct audiohandle *chokehandle;
@@ -2778,14 +2783,8 @@ struct player {
/*0x1970*/ f32 shootroty;
/*0x1974*/ char *award1;
/*0x1978*/ char *award2;
/*0x197c*/ u32 unk197c;
/*0x1980*/ u32 unk1980;
/*0x1984*/ u32 unk1984;
/*0x1988*/ u16 unk1988;
/*0x198c*/ u32 unk198c;
/*0x1990*/ u32 unk1990;
/*0x1994*/ u32 unk1994;
/*0x1998*/ u32 unk1998;
/*0x197c*/ struct coord chrmuzzlelastpos[2];
/*0x1994*/ s32 chrmuzzlelast[2];
/*0x199c*/ f32 healthscale;
/*0x19a0*/ f32 armourscale;
/*0x19a4*/ f32 speedgo;