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

Decompile chopperIncrementBarrel

This commit is contained in:
Ryan Dwyer 2022-04-12 08:16:10 +10:00
parent 63b5219d53
commit 5e32d91c3f
6 changed files with 171 additions and 1862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/botinv.c
View File

@ -129,7 +129,7 @@ struct aibotweaponpreference g_AibotWeaponPreferences[] = {
/*0x56*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_BOLT
/*0x57*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_BRIEFCASE2
/*0x58*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_SKROCKET
/*0x59*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_59
/*0x59*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_CHOPPERGUN
/*0x5a*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_WATCHLASER
/*0x5b*/ { 220, 220, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_MPSHIELD
/*0x5c*/ { 0, 0, 0, 0, 0, 0, BOTDISTCFG_DEFAULT, BOTDISTCFG_DEFAULT, 0, 0, 0, 0, 1, 0 }, // WEAPON_DISABLED

24
src/game/invitems.c
View File

@ -4654,7 +4654,7 @@ struct weapon invitem_briefcase2 = {
WEAPONFLAG_ONEHANDED | WEAPONFLAG_00000800 | WEAPONFLAG_HIDEMENUMODEL | WEAPONFLAG_DONTCOUNTSHOTS | WEAPONFLAG_DETERMINER_S_THE | WEAPONFLAG_DETERMINER_F_THE,
};
struct weaponfunc_shootauto invfunc_59_rapidfire = {
struct weaponfunc_shootauto invfunc_choppergun_rapidfire = {
INVENTORYFUNCTYPE_SHOOT_AUTOMATIC,
L_GUN_086, // name
0x00, // unk06
@ -4681,7 +4681,7 @@ struct weaponfunc_shootauto invfunc_59_rapidfire = {
0, 0,
};
struct inventory_ammo invammo_59 = {
struct inventory_ammo invammo_choppergun = {
AMMOTYPE_SMG,
CASING_RIFLE,
27, // clip size
@ -4689,15 +4689,15 @@ struct inventory_ammo invammo_59 = {
0, // flags
};
struct weapon invitem_59 = {
struct weapon invitem_choppergun = {
0, // hi model
0, // lo model
NULL, // equip animation
NULL, // unequip animation
NULL, // pritosec animation
NULL, // sectopri animation
{ &invfunc_59_rapidfire, NULL }, // functions
&invammo_59, // pri ammo
{ &invfunc_choppergun_rapidfire, NULL }, // functions
&invammo_choppergun, // pri ammo
NULL, // sec ammo
&invclass_default,
1, // sway
@ -4714,7 +4714,7 @@ struct weapon invitem_59 = {
WEAPONFLAG_AICANUSE | WEAPONFLAG_00000040 | WEAPONFLAG_TRACKTIMEUSED | WEAPONFLAG_DUALWIELD,
};
struct weaponfunc_shootauto invfunc_5a_rapidfire = {
struct weaponfunc_shootauto invfunc_watchlaser_rapidfire = {
INVENTORYFUNCTYPE_SHOOT_AUTOMATIC,
L_GUN_086, // name
0x00, // unk06
@ -4741,7 +4741,7 @@ struct weaponfunc_shootauto invfunc_5a_rapidfire = {
0, 0,
};
struct inventory_ammo invammo_5a = {
struct inventory_ammo invammo_watchlaser = {
AMMOTYPE_SMG,
CASING_RIFLE,
27, // clip size
@ -4749,15 +4749,15 @@ struct inventory_ammo invammo_5a = {
0, // flags
};
struct weapon invitem_5a = {
struct weapon invitem_watchlaser = {
0, // hi model
0, // lo model
NULL, // equip animation
NULL, // unequip animation
NULL, // pritosec animation
NULL, // sectopri animation
{ &invfunc_5a_rapidfire, NULL }, // functions
&invammo_5a, // pri ammo
{ &invfunc_watchlaser_rapidfire, NULL }, // functions
&invammo_watchlaser, // pri ammo
NULL, // sec ammo
&invclass_default,
1, // sway
@ -6216,8 +6216,8 @@ struct weapon *g_Weapons[] = {
&invitem_bolt,
&invitem_briefcase2,
&invitem_rocket,
&invitem_59,
&invitem_5a,
&invitem_choppergun,
&invitem_watchlaser,
&invitem_hammer,
&invitem_hammer,
&invitem_suicidepill,

1997
src/game/propobj.c
View File

File diff suppressed because it is too large Load Diff

4
src/include/constants.h
View File

@ -2138,7 +2138,7 @@
#define MODELPART_CHOPPER_0000 0x0000 // position
#define MODELPART_CHOPPER_0001 0x0001 // position
#define MODELPART_CHOPPER_0002 0x0002 // position
#define MODELPART_CHOPPER_0003 0x0003 // gunfire
#define MODELPART_CHOPPER_GUNFLASH 0x0003 // gunfire
#define MODELPART_CHOPPER_0005 0x0005 // toggle
#define MODELPART_CHRGUN_GUNFIRE 0x0000 // gunfire
#define MODELPART_CHRGUN_0001 0x0001 // positionheld
@ -4233,7 +4233,7 @@ enum weaponnum {
/*0x56*/ WEAPON_BOLT,
/*0x57*/ WEAPON_BRIEFCASE2,
/*0x58*/ WEAPON_SKROCKET,
/*0x59*/ WEAPON_59,
/*0x59*/ WEAPON_CHOPPERGUN,
/*0x5a*/ WEAPON_WATCHLASER,
/*0x5b*/ WEAPON_MPSHIELD,
/*0x5c*/ WEAPON_DISABLED,

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

@ -185,7 +185,7 @@ f32 chopperGetTimer(struct chopperobj *heli);
void chopperSetMaxDamage(struct chopperobj *obj, u16 health);
f32 func0f07b164(struct coord *pos1, struct coord *pos2, struct coord *pos3, struct coord *pos4);
void chopperFireRocket(struct chopperobj *chopper, bool side);
void func0f07b3f0(struct prop *prop, bool firing);
void chopperIncrementBarrel(struct prop *prop, bool firing);
void chopperIncrementMovement(struct prop *prop, f32 goalroty, f32 goalrotx, struct coord *dir, bool firing);
void chopperTickFall(struct prop *chopper);
void chopperTickIdle(struct prop *chopper);

4
src/include/types.h
View File

@ -2052,8 +2052,8 @@ struct chopperobj { // objtype 0x39
/*0xbc*/ bool targetvisible;
/*0xc0*/ s32 timer60;
/*0xc4*/ s32 patroltimer60;
/*0xc8*/ u32 gunturnyspeed60;
/*0xcc*/ u32 gunturnxspeed60;
/*0xc8*/ f32 gunturnyspeed60;
/*0xcc*/ f32 gunturnxspeed60;
/*0xd0*/ f32 gunroty;
/*0xd4*/ f32 gunrotx;
/*0xd8*/ f32 barrelrotspeed;