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

Improve mismatch of propPickupByPlayer

Browse Source
This commit is contained in:
Ryan Dwyer
2022-07-22 21:29:01 +10:00
parent 6ee0ebe145
commit 21139bb0a7
4 changed files with 185 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/game/inv.h
+2 -2
View File
@@ -51,8 +51,8 @@ void invInsertTextOverride(struct textoverride *override);
u32 invGetCurrentIndex(void);
void invSetCurrentIndex(u32 item);
void invCalculateCurrentIndex(void);
char *invGetActivatedTextByObj(struct defaultobj *obj);
char *invGetActivatedTextByWeaponNum(s32 weaponnum);
char *invGetPickupTextByObj(struct defaultobj *obj);
char *invGetPickupTextByWeaponNum(s32 weaponnum);
void invIncrementHeldTime(s32 param_1, s32 param_2);
void invGetWeaponOfChoice(s32 *weapon1, s32 *weapon2);
src/include/types.h
+5 -5
View File
@@ -4640,11 +4640,11 @@ struct textoverride {
/*0x00*/ u32 unk00;
/*0x04*/ s32 objoffset;
/*0x08*/ s32 weapon;
/*0x0c*/ u32 unk0c;
/*0x10*/ u32 unk10;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 activatetextid;
/*0x0c*/ u32 obtaintext; // eg. "Obtain medlab 2 keycard\n"
/*0x10*/ u32 ownertext; // eg. "Guard's\n"
/*0x14*/ u32 inventorytext; // eg. "Medlab 2 key card\n"
/*0x18*/ u32 inventory2text; // eg. "Medlab 2 key card\n"
/*0x1c*/ u32 pickuptext; // eg. "Picked up medlab 2 key card.\n"
/*0x20*/ struct textoverride *next;
/*0x24*/ struct defaultobj *obj;
};