mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-06-28 02:03:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename some chr flags

Browse Source
This commit is contained in:
Ryan Dwyer
2021-11-29 23:10:27 +10:00
parent 76dacd2ef5
commit 9ca1966b47
27 changed files with 198 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/commands.h
+5 -2
View File
@@ -3201,8 +3201,11 @@
mkshort(0x0167), \
side,
// If flag is set, unsets it and goes to label
#define try_unset_chr_flag_bank3_02000000(chr, label) \
/**
* Checks if the chr's shield has been damaged since the last time it was
* checked.
*/
#define if_chr_shield_damaged(chr, label) \
mkshort(0x0168), \
chr, \
label,
src/include/constants.h
+5 -5
View File
@@ -438,8 +438,8 @@
// chr->hidden
#define CHRHFLAG_00000001 0x00000001 // Set when chr drops weapon
#define CHRHFLAG_IS_HEARING_TARGET 0x00000002 // Not used in scripts
#define CHRHFLAG_00000004 0x00000004 // Related to firing - hand 1
#define CHRHFLAG_00000008 0x00000008 // Related to firing - hand 0
#define CHRHFLAG_FIRINGLEFT 0x00000004
#define CHRHFLAG_FIRINGRIGHT 0x00000008
#define CHRHFLAG_BLOCKINGDOOR 0x00000010
#define CHRHFLAG_REAPED 0x00000020
#define CHRHFLAG_TIMER_RUNNING 0x00000040
@@ -488,7 +488,7 @@
#define CHRCFLAG_INVINCIBLE 0x00000010
#define CHRCFLAG_LOSEXTRAHEIGHT 0x00000020 // Chicago, Infiltration, AF1, Ruins, WAR
#define CHRCFLAG_00000040 0x00000040 // Used quite a lot
#define CHRCFLAG_00000080 0x00000080 // Defection programmer, Rescue lab techs, globals when doing idle animation
#define CHRCFLAG_CANFACEWALL 0x00000080 // Defection programmer, Rescue lab techs, globals when doing idle animation
#define CHRCFLAG_JUST_INJURED 0x00000100
#define CHRCFLAG_00000200 0x00000200 // Set on clones
#define CHRCFLAG_HIDDEN 0x00000400
@@ -497,7 +497,7 @@
#define CHRCFLAG_NOSHADOW 0x00002000
#define CHRCFLAG_HAS_SPECIAL_DEATH_ANIMATION 0x00004000
#define CHRCFLAG_DIEWITHFORCE 0x00008000 // When killed with a weak weapon, fling the chr as if it was a strong weapon
#define CHRCFLAG_00010000 0x00010000 // Related to dead people in intro cutscenes
#define CHRCFLAG_PERIMDISABLEDTMP 0x00010000 // Collisions disabled temporarily
#define CHRCFLAG_FORCEAUTOAIM 0x00020000 // Allow auto aim even if chr is unarmed
#define CHRCFLAG_00040000 0x00040000 // Used a lot
#define CHRCFLAG_RUNFASTER 0x00080000
@@ -506,7 +506,7 @@
#define CHRCFLAG_00400000 0x00400000 // Not used in scripts
#define CHRCFLAG_UNPLAYABLE 0x00800000
#define CHRCFLAG_PUSHABLE 0x01000000 // Typically set on allies during init
#define CHRCFLAG_02000000 0x02000000 // can be unset by cmd0168
#define CHRCFLAG_SHIELDDAMAGED 0x02000000
#define CHRCFLAG_KEEPCORPSEKO 0x04000000
#define CHRCFLAG_CONSIDER_DODGE 0x08000000
#define CHRCFLAG_10000000 0x10000000 // Not used in scripts
src/include/game/chr/chraction.h
+1 -1
View File
@@ -277,7 +277,7 @@ void func0f03e5b0(struct chrdata *chr, f32 arg1);
void chrResetAimEndProperties(struct chrdata *chr);
void chrSetFiring(struct chrdata *chr, s32 hand, bool firing);
void chrStopFiring(struct chrdata *chr);
void func0f03f988(struct chrdata *chr, s32 hand, bool arg2);
void chrSetHandFiring(struct chrdata *chr, s32 hand, bool arg2);
void func0f0429d8(struct chrdata *chr, f32 arg1, f32 arg2);
void propUnsetDangerous(struct prop *prop);
void propSetDangerous(struct prop *prop);
src/include/game/chr/chraicommands.h
+1 -1
View File
@@ -338,7 +338,7 @@
/*0x0165*/ bool aiIfChrInjured(void);
/*0x0166*/ bool aiIfAction(void);
/*0x0167*/ bool aiHovercopterFireRocket(void);
/*0x0168*/ bool ai0168(void);
/*0x0168*/ bool aiIfShieldDamaged(void);
/*0x0169*/ bool aiIfNaturalAnim(void);
/*0x016a*/ bool aiIfY(void);
/*0x016b*/ bool ai016b(void);
src/include/game/prop.h
+1 -1
View File
@@ -35,7 +35,7 @@ void propPause(struct prop *prop);
void propUnpause(struct prop *prop);
void propsTick(u32 islastplayer);
void propsTickPadEffects(void);
void propSetCollisionsEnabled(struct prop *prop, bool enable);
void propSetPerimEnabled(struct prop *prop, bool enable);
void func0f0641f4(void);
f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f32 *arg4, s32 arg5, bool cangangsta, s32 arg7);
void farsightChooseTarget(void);