falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename func0f02f288 to chrThrowGrenade

This commit is contained in:
Ryan Dwyer 2020-01-22 19:10:28 +10:00
parent bd094bf859
commit f28bca3140
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/chr/chr.c
View File

@ -19848,12 +19848,12 @@ glabel func0f02f070
/* f02f284: 00000000 */ sll $zero,$zero,0x0
);
void func0f02f288(struct chrdata *chr, s32 arg1, s32 arg2)
void chrThrowGrenade(struct chrdata *chr, s32 hand, s32 needsequip)
{
chrStopFiring(chr);
chr->actiontype = ACT_THROWGRENADE;
chr->act_throwgrenade.unk034 = arg1;
chr->act_throwgrenade.unk038 = arg2;
chr->act_throwgrenade.hand = hand;
chr->act_throwgrenade.needsequip = needsequip;
chr->sleep = 0;
if (func0001db94(chr->unk020)) {
@ -33254,7 +33254,7 @@ s32 chrConsiderGrenadeThrow(struct chrdata *chr, u32 entitytype, u32 entityid)
weapon = rightprop->weapon;
if (weapon->weapon_id == WEAPON_GRENADE || weapon->weapon_id == WEAPON_NBOMB) {
func0f02f288(chr, 0, false);
chrThrowGrenade(chr, 0, false);
chr->act_throwgrenade.entitytype = entitytype;
chr->act_throwgrenade.entityid = entityid;
done = true;
@ -33265,7 +33265,7 @@ s32 chrConsiderGrenadeThrow(struct chrdata *chr, u32 entitytype, u32 entityid)
weapon = leftprop->weapon;
if (weapon->weapon_id == WEAPON_GRENADE || weapon->weapon_id == WEAPON_NBOMB) {
func0f02f288(chr, 1, false);
chrThrowGrenade(chr, 1, false);
chr->act_throwgrenade.entitytype = entitytype;
chr->act_throwgrenade.entityid = entityid;
done = true;
@ -33292,7 +33292,7 @@ s32 chrConsiderGrenadeThrow(struct chrdata *chr, u32 entitytype, u32 entityid)
if (prop) {
weapon = prop->weapon;
weapon->hidden |= 0x00000800;
func0f02f288(chr, rightprop == NULL ? 0 : 1, true);
chrThrowGrenade(chr, rightprop == NULL ? 0 : 1, true);
chr->act_throwgrenade.entitytype = entitytype;
chr->act_throwgrenade.entityid = entityid;
done = true;

2
src/include/game/chr/chr.h
View File

@ -146,7 +146,7 @@ void chrKneel(struct chrdata *chr);
void func0f02ef40(struct chrdata *chr);
void func0f02effc(struct chrdata *chr);
void func0f02f070(struct chrdata *chr);
void func0f02f288(struct chrdata *chr, s32 arg1, s32 arg2);
void chrThrowGrenade(struct chrdata *chr, s32 arg1, s32 arg2);
void func0f02f314(struct chrdata *chr);
void func0f02f530(struct chrdata *chr);
void func0f02f60c(struct chrdata *chr);

4
src/include/types.h
View File

@ -395,8 +395,8 @@ struct act_surprised {
struct act_throwgrenade {
/*0x2c*/ u32 entitytype;
/*0x30*/ u32 entityid;
/*0x34*/ u32 unk034;
/*0x38*/ u32 unk038;
/*0x34*/ u32 hand;
/*0x38*/ bool needsequip;
};
struct act_attackamount {