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

Decompile escastepTick

Browse Source
This commit is contained in:
Ryan Dwyer
2021-01-17 13:08:34 +10:00
parent 5ec36ff8fb
commit 2bc3549f13
10 changed files with 145 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/constants.h
+2 -1
View File
@@ -2373,6 +2373,7 @@
#define OBJFLAG_DEACTIVATED 0x10000000
#define OBJFLAG_DOOR_HASPORTAL 0x10000000
#define OBJFLAG_WEAPON_10000000 0x10000000
#define OBJFLAG_ESCSTEP_ZALIGNED 0x10000000
#define OBJFLAG_20000000 0x20000000 // Editor: "Door Opens Backwards/Special Function/Conceal Weapon"
#define OBJFLAG_40000000 0x40000000
#define OBJFLAG_DOOR_KEEPOPEN 0x40000000 // Editor: "Door open by default/Empty weapon"
@@ -2537,7 +2538,7 @@
#define OBJTYPE_PADEFFECT 0x38
#define OBJTYPE_CHOPPER 0x39 // Extraction hovercopter and A51 interceptors
#define OBJTYPE_MINE 0x3a
#define OBJTYPE_ESCALATOR 0x3b
#define OBJTYPE_ESCASTEP 0x3b
#define OPERATOR_LESS_THAN 0
#define OPERATOR_GREATER_THAN 1
src/include/game/data/data_00e460.h
+2 -2
View File
@@ -70,8 +70,8 @@ extern u32 var80069bc8;
extern u32 var80069bcc;
extern u32 var80069bd0;
extern u32 g_DebugDoor;
extern u32 var80069bd8;
extern u32 var80069c48;
extern struct escastepkeyframe g_EscaStepKeyframesX[];
extern struct escastepkeyframe g_EscaStepKeyframesZ[];
extern u32 var80069cc4;
extern u32 var80069d04;
extern u32 var80069d44;
src/include/game/propobj.h
+1 -1
View File
@@ -164,7 +164,7 @@ void doorUpdatePortalIfWindowed(struct prop *door, s32 playercount);
u32 func0f077448(void);
void platformDisplaceProps(struct prop *platform, s16 *propnums, struct coord *prevpos, struct coord *newpos);
void liftTick(struct prop *lift);
void escalatorTick(struct prop *escalator);
void escastepTick(struct prop *escalator);
void cameraTick(struct prop *camera);
u32 func0f078930(void);
void fanTick(struct prop *fan);
src/include/props.h
+1 -1
View File
@@ -287,6 +287,6 @@
_generic_object(0x3a, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
u20, u21, u22,
#define escalator(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23) \
#define escastep(scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19, u20, u21, u22, u23) \
_generic_object(0x3b, scale, model, pad, props1, props2, u1, u2, u3, u4, u5, u6, u7, u8, u9, u10, u11, u12, u13, u14, u15, u16, u17, u18, u19), \
u20, u21, u22, u23,
src/include/types.h
+6 -1
View File
@@ -1629,7 +1629,7 @@ struct mineobj { // objtype 0x3a
struct escalatorobj { // objtype 0x3b
struct defaultobj base;
/*0x5c*/ u32 frame;
/*0x5c*/ s32 frame;
/*0x60*/ struct coord prevpos;
};
@@ -6899,4 +6899,9 @@ struct collisionthing {
u32 unk10;
};
struct escastepkeyframe {
s32 frame;
struct coord pos;
};
#endif