Rename door functions and add docblocks

This commit is contained in:
Ryan Dwyer
2021-03-01 12:08:39 +10:00
parent 506f3223f6
commit b1bfdbe6b6
9 changed files with 98 additions and 58 deletions
+6 -2
View File
@@ -945,8 +945,12 @@
object, \
label,
// Unused, and no idea what it does.
#define cmd0065(object) \
/**
* Interacts with the given object, as if the player pressed B on it.
*
* If the object is a door, lock checks are skipped.
*/
#define obj_interact(object) \
mkshort(0x0065), \
object,
+1 -1
View File
@@ -2522,7 +2522,7 @@
#define OBJFLAG2_LOCKEDFRONT 0x08000000 // One-way door lock
#define OBJFLAG2_LOCKEDBACK 0x10000000 // One-way door lock
#define OBJFLAG2_AICANNOTUSE 0x20000000
#define OBJFLAG2_40000000 0x40000000 // Used by doors
#define OBJFLAG2_AIRLOCKDOOR 0x40000000 // Door waits for sibling to close before it can open
#define OBJFLAG2_80000000 0x80000000 // Attack Ship glass
// obj->flags3
+1 -1
View File
@@ -104,7 +104,7 @@
/*0x0061*/ bool aiIfGunUnclaimed(void);
/*0x0062*/ bool aiIfObjectHealthy(void);
/*0x0063*/ bool aiIfChrActivatedObject(void);
/*0x0065*/ bool ai0065(void);
/*0x0065*/ bool aiObjInteract(void);
/*0x0066*/ bool aiDestroyObject(void);
/*0x0067*/ bool ai0067(void);
/*0x0068*/ bool aiChrDropItems(void);
+5 -5
View File
@@ -27,7 +27,7 @@ void countdownTimerSetRunning(bool running);
void countdownTimerSetValue(f32 frames);
void countdownTimerSetVisible(u32 flag, bool show);
void countdownTimerTick(void);
bool doorCallLift(struct prop *doorprop, bool onlyifclosed);
bool doorCallLift(struct prop *doorprop, bool allowclose);
bool doorIsPadlockFree(struct doorobj *door);
bool objPassesSafePickupChecks(struct defaultobj *obj);
void objUpdateLinkedScenery(struct defaultobj *obj);
@@ -314,13 +314,13 @@ void func0f08d784(s32 soundtype, struct prop *prop);
void func0f08daa8(s32 soundtype, struct prop *prop);
void func0f08dd44(s32 soundtype, struct prop *prop);
void func0f08df10(s32 soundtype, struct prop *prop);
void func0f08e0c4(struct doorobj *door);
void func0f08e1a0(struct doorobj *door);
void doorPrepareForOpen(struct doorobj *door);
void doorPrepareForClose(struct doorobj *door);
u32 decodeXorAaaaaaaa(u32 value);
void func0f08e224(struct doorobj *door);
void func0f08e2ac(struct doorobj *door);
void doorSetMode(struct doorobj *door, s32 newmode);
void doorActivate(struct doorobj *door, s32 newmode);
void doorsRequestMode(struct doorobj *door, s32 newmode);
s32 doorIsClosed(struct doorobj *door);
s32 doorIsOpen(struct doorobj *door);
s32 func0f08e5a8(s16 *rooms, struct screenbox *box);
@@ -335,7 +335,7 @@ u32 func0f08f538(void);
u32 func0f08f604(void);
bool func0f08f968(struct doorobj *door, bool arg1);
bool doorTestForInteract(struct prop *prop);
void doorActivateWrapper(struct prop *prop, bool arg1);
void doorsActivate(struct prop *prop, bool allowliftclose);
u32 func0f08fffc(void);
void func0f0900c0(struct prop *prop, struct doorobj *door);
bool propdoorInteract(struct prop *doorprop);