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

Rename player.unk1581 and unk1582 to prevweaponnum and switchtoweaponnum

This commit is contained in:
Ryan Dwyer 2020-12-15 22:14:40 +10:00
parent 525c648f03
commit 654246a27e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/game/game_097ba0.c
View File

@ -12109,11 +12109,11 @@ void currentPlayerEquipWeapon(s32 weaponnum)
{
struct player *player = g_Vars.currentplayer;
if (player->weaponnum == weaponnum && player->unk1582 == -1) {
if (player->weaponnum == weaponnum && player->switchtoweaponnum == -1) {
return;
}
player->unk1582 = weaponnum;
player->switchtoweaponnum = weaponnum;
player->unk1583_05 = 0;
}
@ -12143,32 +12143,32 @@ bool func0f0a1a10(s32 weaponnum)
s32 func0f0a1a68(s32 arg0)
{
s32 result;
s32 weaponnum;
if (g_Vars.currentplayer->unk1582 >= 0) {
result = g_Vars.currentplayer->unk1582;
if (g_Vars.currentplayer->switchtoweaponnum >= 0) {
weaponnum = g_Vars.currentplayer->switchtoweaponnum;
} else {
result = g_Vars.currentplayer->weaponnum;
weaponnum = g_Vars.currentplayer->weaponnum;
}
if (!g_Vars.currentplayer->unk1583_00 && arg0 == 1) {
result = 0;
weaponnum = WEAPON_NONE;
}
return result;
return weaponnum;
}
void func0f0a1ab0(void)
{
if (g_Vars.tickmode != TICKMODE_CUTSCENE) {
struct player *player = g_Vars.currentplayer;
s32 value;
s32 dualweaponnum;
if (currentPlayerCanHaveWeapon(player->unk1581)) {
currentPlayerEquipWeaponWrapper(0, player->unk1581);
if (currentPlayerCanHaveWeapon(player->prevweaponnum)) {
currentPlayerEquipWeaponWrapper(HAND_RIGHT, player->prevweaponnum);
value = func0f111cf8(player->unk1581, player->unk1581) * player->unk1581 * player->unk1583_01;
currentPlayerEquipWeaponWrapper(1, value);
dualweaponnum = func0f111cf8(player->prevweaponnum, player->prevweaponnum) * player->prevweaponnum * player->unk1583_01;
currentPlayerEquipWeaponWrapper(HAND_LEFT, dualweaponnum);
} else {
func0f0a1df4();
}
@ -20620,7 +20620,7 @@ void currentPlayerTickInventory(bool triggeron)
}
if (g_Vars.currentplayer->weaponnum != WEAPON_UNARMED
&& g_Vars.currentplayer->unk1582 != WEAPON_UNARMED) {
&& g_Vars.currentplayer->switchtoweaponnum != WEAPON_UNARMED) {
currentPlayerEquipWeapon(WEAPON_UNARMED);
}

4
src/include/types.h
View File

@ -2488,8 +2488,8 @@ struct player {
/*0x0636*/ s16 viewtop; // 0
/*0x0638*/ struct hand hands[2];
/*0x1580*/ s8 weaponnum;
/*0x1581*/ s8 unk1581; // also a weaponnum
/*0x1582*/ s8 unk1582;
/*0x1581*/ s8 prevweaponnum; // previously drawn weapon, switched to when throwing Dragon/Laptop or when ammo depleted
/*0x1582*/ s8 switchtoweaponnum; // weaponnum to change to
/*0x1583*/ u8 unk1583_00 : 1;
/*0x1583*/ u8 unk1583_01 : 1;
/*0x1583*/ u8 invertgunfunc : 1;