Decompile coordTriggerProxies

This commit is contained in:
Ryan Dwyer
2021-05-19 20:50:59 +10:00
parent e7ce33c495
commit b8ea4e57a0
10 changed files with 67 additions and 104 deletions
+1 -1
View File
@@ -108,7 +108,7 @@ extern struct var8009cda4 *var8009cda4;
extern struct prop *var8009cda8;
extern u32 var8009cdac;
extern u32 var8009cdb0;
extern struct weaponobj *g_ProxyMines[30];
extern struct weaponobj *g_Proxies[30];
extern s32 var8009ce40;
extern s32 var8009ce44;
extern s32 var8009ce48;
+1 -1
View File
@@ -276,7 +276,7 @@ struct weaponobj *func0f08aa70(s32 weaponnum, struct prop *prop);
struct weaponobj *weaponFindThrown(s32 weaponnum);
u32 func0f08ab64(void);
u32 func0f08ab9c(void);
void func0f08abd4(struct coord *pos, u32 arg1);
void coordTriggerProxies(struct coord *pos, bool arg1);
void func0f08acb0(void);
void propweaponSetDual(struct weaponobj *weapon1, struct weaponobj *weapon2);
u32 func0f08adc8(void);
+4 -5
View File
@@ -1740,12 +1740,11 @@ struct weaponobj { // objtype 0x08
/*0x61*/ s8 dualweaponnum;
/**
* Appears to have multiple uses:
* Grenades = timer?
* Proxy mines = timer240 (counts down)
* CTC briefcase = team index
* timer240 is used for activation of proxy Dragons, grenades and proxy
* mines. It ticks down to 1 where it becomes active, and set to 0 when the
* item should explode.
*/
/*0x62*/ s16 unk62;
/*0x62*/ s16 timer240;
/*0x64*/ struct weaponobj *dualweapon; // other weapon when dual wielding
};