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

Rename prop list symbols

Browse Source
This commit is contained in:
Ryan Dwyer
2021-06-02 12:13:16 +10:00
parent 82184c5d9f
commit b2d967f339
52 changed files with 1267 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/commands.h
+16 -11
View File
@@ -1613,7 +1613,7 @@
/**
* Sets a flag on the object's flags property (object struct offset 0x08).
*
* Expects an OBJECTFLAG constant.
* Expects an OBJFLAG constant.
*/
#define set_object_flag(object, objectflag) \
mkshort(0x00aa), \
@@ -1644,7 +1644,7 @@
/**
* Sets a flag on the object's flags2 property (object struct offset 0x0c).
*
* Expects an OBJECTFLAG2 constant.
* Expects an OBJFLAG2 constant.
*/
#define set_object_flag2(object, objectflag2) \
mkshort(0x00ad), \
@@ -2498,37 +2498,42 @@
label,
/**
* Shows the given chr.
* Enables the given chr. The chr will become visible, will tick and will be
* considered in collision checks.
*/
#define show_chr(chr) \
#define enable_chr(chr) \
mkshort(0x0114), \
chr,
/**
* Hides the given chr.
* Disables the given chr. Disabled chrs are invisible, do not tick and are not
* considered in collision checks. Disabled chrs can still be damaged by
* explosives, at which point they become enabled (and die) automatically.
*/
#define hide_chr(chr) \
#define disable_chr(chr) \
mkshort(0x0115), \
chr,
/**
* Shows the given object.
* Enables the given object. The object will become visible, will tick and will
* be considered in collision checks.
*/
#define show_object(object) \
#define enable_object(object) \
mkshort(0x0116), \
object,
/**
* Hides the given object.
* Disables the given object. Disabled object are invisible, do not tick and are
* not considered in collision checks.
*/
#define hide_object(object) \
#define disable_object(object) \
mkshort(0x0117), \
object,
/**
* Sets a flag on the object's flags3 property (object struct offset 0x10).
*
* Expects an OBJECTFLAG3 constant.
* Expects an OBJFLAG3 constant.
*/
#define set_object_flag3(object, objectflag3) \
mkshort(0x0118), \
src/include/constants.h
+3 -3
View File
@@ -3185,10 +3185,10 @@
#define PROJECTILEFLAG_FREE 0x80000000
#define PROPFLAG_01 0x01
#define PROPFLAG_02 0x02
#define PROPFLAG_TANGIBLE 0x04
#define PROPFLAG_ONSCREEN 0x02
#define PROPFLAG_ENABLED 0x04
#define PROPFLAG_08 0x08
#define PROPFLAG_10 0x10
#define PROPFLAG_DONTPAUSE 0x10
#define PROPFLAG_20 0x20
#define PROPFLAG_40 0x40
#define PROPFLAG_80 0x80
src/include/game/bg.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "data.h"
#include "types.h"
void roomMovePropsToList1(u32 roomnum, bool tintedglassonly);
void roomUnpauseProps(u32 roomnum, bool tintedglassonly);
void func0f157e94(s32 room, s32 arg1, struct screenbox *arg2);
void func0f158108(s32 roomnum, u8 *arg1, u8 *arg2);
struct var800a4640_00 *func0f158140(s32 roomnum);
src/include/game/chr/chraicommands.h
+4 -4
View File
@@ -277,10 +277,10 @@
/*0x0111*/ bool aiSetCameraAnimation(void);
/*0x0112*/ bool aiObjectDoAnimation(void);
/*0x0113*/ bool aiIfInCutscene(void);
/*0x0114*/ bool aiShowChr(void);
/*0x0115*/ bool aiHideChr(void);
/*0x0116*/ bool aiShowObj(void);
/*0x0117*/ bool aiHideObj(void);
/*0x0114*/ bool aiEnableChr(void);
/*0x0115*/ bool aiDisableChr(void);
/*0x0116*/ bool aiEnableObj(void);
/*0x0117*/ bool aiDisableObj(void);
/*0x0118*/ bool aiSetObjFlag3(void);
/*0x0119*/ bool aiUnsetObjFlag3(void);
/*0x011a*/ bool aiIfObjHasFlag3(void);
src/include/game/prop.h
+7 -7
View File
@@ -7,13 +7,13 @@
extern f32 var80069880;
void func0f0601b0(void);
void propShow(struct prop *prop);
void propHide(struct prop *prop);
void propEnable(struct prop *prop);
void propDisable(struct prop *prop);
struct prop *propAllocate(void);
void propFree(struct prop *prop);
void propPrependToList1(struct prop *prop);
void propAppendToList1(struct prop *prop);
void propRemoveFromCurrentList(struct prop *prop);
void propActivate(struct prop *prop);
void propActivateThisFrame(struct prop *prop);
void propDelist(struct prop *prop);
void propReparent(struct prop *mover, struct prop *adopter);
void propDetach(struct prop *prop);
Gfx *propRender(Gfx *gdl, struct prop *prop, bool withalpha);
@@ -31,8 +31,8 @@ void propExecuteTickOperation(struct prop *prop, s32 op);
struct prop *currentPlayerFindPropForInteract(bool eyespy);
void func0f062dd0(void);
bool currentPlayerInteract(bool eyespy);
void propPrependToList2(struct prop *prop);
void propMoveFromList2To1(struct prop *prop);
void propPause(struct prop *prop);
void propUnpause(struct prop *prop);
void propsTick(u32 islastplayer);
void func0f063dcc(void);
void propSetCollisionsEnabled(struct prop *prop, bool enable);
src/include/types.h
+32 -22
View File
@@ -159,14 +159,14 @@ struct g_vars {
/*00032c*/ bool enableslopes;
/*000330*/ u32 padrandomroutes;
/*000334*/ s32 maxprops;
/*000338*/ struct prop *props; // pointer to array
/*00033c*/ struct prop *list1head;
/*000340*/ struct prop *list1tail; // next pointer points to list2head
/*000344*/ struct prop *freeprops;
/*000348*/ struct prop **tangibleprops;
/*00034c*/ struct prop **unk00034c;
/*000338*/ struct prop *props; // pointer to array of structs
/*00033c*/ struct prop *activeprops; // head of a doubly linked list
/*000340*/ struct prop *activepropstail; // next pointer points to pausedprops
/*000344*/ struct prop *freeprops; // head of a singularly linked list
/*000348*/ struct prop **enabledprops;
/*00034c*/ struct prop **endenabledprops;
/*000350*/ struct prop *unk000350;
/*000354*/ struct prop *list2head; // prev pointer points to list1tail
/*000354*/ struct prop *pausedprops; // head of a doubly linked list, prev pointer points to activepropstail
/*000358*/ u8 numpropstates;
/*000359*/ u8 allocstateindex;
/*00035a*/ u8 runstateindex;
@@ -413,15 +413,11 @@ struct prop {
/*0x3a*/ u16 propupdate240;
/*0x3c*/ u8 propupdate60err;
/*0x3d*/ u8 propstateindex;
/*0x3e*/ u8 unk3e;
/*0x3f*/ u8 forcetick : 1;
/*0x3e*/ u8 backgroundedframes;
/*0x3f*/ u8 forceonetick : 1;
/*0x3f*/ u8 backgrounded : 1;
/*0x3f*/ u8 unk3f_02 : 1;
/*0x3f*/ u8 inlist1 : 1;
/*0x3f*/ u8 unk3f_04 : 1;
/*0x3f*/ u8 unk3f_05 : 1;
/*0x3f*/ u8 unk3f_06 : 1;
/*0x3f*/ u8 unk3f_07 : 1;
/*0x3f*/ u8 forcetick : 1;
/*0x3f*/ u8 active : 1;
/*0x40*/ struct var800a41b0 *unk40;
/*0x44*/ struct var800a41b0 *unk44;
};
@@ -2121,10 +2117,24 @@ struct gunheld {
};
struct playerbond {
// unk00.x = look vector x (-1 to +1)
// unk00.y = always 0?
// unk00.z = look vector z (-1 to +1)
/*0x0338 0x036c*/ struct coord unk00;
/*0x0344 0x0378*/ f32 width;
/*0x0344 0x0378*/ f32 width; // always 30?
/*0x0348 0x037c*/ struct coord unk10;
// unk1c.x = affected by both left/right and up/down looking
// unk1c.y = vertical look vector (-1 for down, 1 for up)
// unk1c.z = affected by both left/right and up/down looking
/*0x0354 0x0388*/ struct coord unk1c;
// unk28.x = affected by both horiz and vertical angle
// unk28.y = 0 when looking up or down, .999 when looking horizontal
// unk28.z = pos.z
/*0x0360 0x0394*/ struct coord unk28;
};
@@ -2469,7 +2479,7 @@ struct gunctrl {
struct player {
/*0x0000*/ s32 cameramode;
/*0x0004*/ struct coord memcampos;
/*0x0004*/ struct coord memcampos; // Room that the camera is in (differs from the player's room during cutscenes and Slayer rocket)
/*0x0010*/ u16 visionmode;
/*0x0014*/ s32 memcamroom;
/*0x0018*/ struct coord eraserpos;
@@ -2477,7 +2487,7 @@ struct player {
/*0x0028*/ u32 eraserbgdist;
/*0x002c*/ u32 eraserdepth;
/*0x0030*/ bool isfalling;
/*0x0034*/ s32 fallstart;
/*0x0034*/ s32 fallstart; // lvframe60 when player started falling
/*0x0038*/ struct coord globaldrawworldoffset;
/*0x0044*/ struct coord globaldrawcameraoffset;
/*0x0050*/ struct coord globaldrawworldbgoffset;
@@ -2493,9 +2503,9 @@ struct player {
// These crouch fields are related to recovering after a fall - not actual crouching
/*0x0088*/ f32 sumcrouch;
/*0x008c*/ f32 crouchheight;
/*0x0090*/ s32 crouchtime240;
/*0x0094*/ f32 crouchfall;
/*0x008c*/ f32 crouchheight; // Negative, is Y offset to regular standing height
/*0x0090*/ s32 crouchtime240; // Set to 60 when landing, counts down
/*0x0094*/ f32 crouchfall; // -90 when slowing the descent, increments back to 0 while returning to stand
/*0x0098*/ s32 swaypos;
/*0x009c*/ f32 swayoffset;
@@ -2558,7 +2568,7 @@ struct player {
/*0x016c*/ f32 speedstrafe;
/*0x0170*/ f32 speedforwards; // range -1 to 1
/*0x0174*/ f32 speedboost; // speed multiplier - ranges from 1 to 1.25 - kicks in after 3 seconds of full speed
/*0x0178*/ u32 speedmaxtime60; // amount of time player has held full forward speed - 60 is 1 second
/*0x0178*/ u32 speedmaxtime60; // amount of time player has held full forward speed
/*0x017c*/ f32 bondshotspeed[3];
/*0x0188*/ f32 bondfadetime60;
/*0x018c*/ f32 bondfadetimemax60;