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

Decompile explosionInflictDamage

This commit is contained in:
Ryan Dwyer 2022-03-21 19:11:14 +10:00
parent 306c1287e9
commit 2fc9e47bd5
7 changed files with 358 additions and 3101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/chr.c
View File

@ -5125,7 +5125,7 @@ glabel var7f1a8944
* each pointer found, the vertices at that offset in the table are adjusted
* randomly. Lastly, every colour in the node's colour table is darkened.
*/
void chrDisfigure(struct chrdata *chr, u32 arg1, u32 arg2)
void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius)
{
struct modelnode *node;
struct modelrodata_dl *rodata;

3441
src/game/explosions.c
View File

File diff suppressed because it is too large Load Diff

2
src/game/mainmenu.c
View File

@ -1671,6 +1671,7 @@ s32 menuhandlerBuddyOptionsContinue(s32 operation, struct menuitem *item, union
return 0;
}
#if VERSION >= VERSION_NTSC_1_0
s32 getMaxAiBuddies(void)
{
u32 stack;
@ -1702,6 +1703,7 @@ s32 getMaxAiBuddies(void)
return max;
}
#endif
s32 menudialogCoopAntiOptions(s32 operation, struct menudialogdef *dialogdef, union handlerdata *data)
{

4
src/game/propobj.c
View File

@ -497,7 +497,7 @@ bool objCanPickupFromSafe(struct defaultobj *obj)
return true;
}
void objUpdateLinkedScenery(struct defaultobj *obj, s32 arg1)
void objUpdateLinkedScenery(struct defaultobj *obj, struct prop *arg1)
{
if ((obj->hidden & OBJHFLAG_CONDITIONALSCENERY) && (obj->flags & OBJFLAG_INVINCIBLE) == 0) {
struct linksceneryobj *link = g_LinkedScenery;
@ -5779,7 +5779,7 @@ glabel var7f1aa1fc
);
#endif
void func0f06a170(struct defaultobj *obj, s32 arg1)
void func0f06a170(struct defaultobj *obj, struct prop *arg1)
{
struct model *model = obj->model;
s32 i;

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

@ -45,7 +45,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool withalpha);
void chrEmitSparks(struct chrdata *chr, struct prop *prop, s32 hitpart, struct coord *coord, struct coord *coord2, struct chrdata *chr2);
u32 chr0f0260c4(void);
void chrBruise(struct model *model, s32 hitpart, struct modelnode *node, struct coord *arg3);
void chrDisfigure(struct chrdata *chr, u32 arg1, u32 arg2);
void chrDisfigure(struct chrdata *chr, struct coord *exppos, f32 damageradius);
f32 chr0f0278a4(struct chrdata *chr);
void chr0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool arg3);
void chrHit(struct shotdata *shotdata, struct hit *hit);

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

@ -17,7 +17,7 @@ void explosionAlertChrs(f32 *radius, struct coord *noisepos);
bool explosionCreate(struct prop *prop, struct coord *pos, s16 *rooms, s16 type, s32 playernum, bool arg5, struct coord *arg6, s16 room, struct coord *arg8);
void explosionsUpdateShake(struct coord *arg0, struct coord *arg1, struct coord *arg2);
bool func0f12af5c(struct explosion *exp, struct prop *prop, struct coord *pos1, struct coord *pos2);
void func0f12b0e0(struct prop *prop);
void explosionInflictDamage(struct prop *prop);
u32 explosionTick(struct prop *prop);
u32 explosionTickPlayer(struct prop *prop);
Gfx *explosionRender(struct prop *prop, Gfx *gdl, bool withalpha);

6
src/include/game/propobj.h
View File

@ -29,7 +29,7 @@ void countdownTimerTick(void);
bool doorCallLift(struct prop *doorprop, bool allowclose);
bool doorIsPadlockFree(struct doorobj *door);
bool objCanPickupFromSafe(struct defaultobj *obj);
void objUpdateLinkedScenery(struct defaultobj *obj, s32 arg1);
void objUpdateLinkedScenery(struct defaultobj *obj, struct prop *arg1);
u32 func0f0667ac(void);
u32 func0f0667b4(void);
f32 modelBboxGetYMin(struct modelrodata_bbox *bbox);
@ -94,8 +94,8 @@ void func0f069b4c(struct defaultobj *obj);
void func0f069c1c(struct defaultobj *obj);
void func0f069c70(struct defaultobj *obj, bool arg1, bool arg2);
void objInitToggleNodes(struct defaultobj *obj);
void func0f069d38(struct defaultobj *obj, s32 arg1, s32 arg2);
void func0f06a170(struct defaultobj *obj, s32 arg1);
void func0f069d38(struct defaultobj *obj, s32 arg1, struct prop *arg2);
void func0f06a170(struct defaultobj *obj, struct prop *arg1);
struct prop *objInit(struct defaultobj *obj, struct modelfiledata *filedata, struct prop *prop, struct model *model);
struct prop *objInitWithModelDef(struct defaultobj *obj, struct modelfiledata *modelfiledata);
struct prop *objInitWithAutoModel(struct defaultobj *obj);