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

Fix player->unk1580 bitfield

This commit is contained in:
Ryan Dwyer 2020-03-29 14:08:51 +10:00
parent d24cb43445
commit 07839f3744
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/game_0fd660.c
View File

@ -1200,7 +1200,7 @@ glabel func0f0fecd4
void activemenuOpen(void)
{
if ((g_Vars.currentplayer->unk1580_s32 & 1) == 0) {
if (g_Vars.currentplayer->unk1583_07 == 0) {
g_ActiveMenuIndex = g_Vars.currentplayernum;
g_Vars.currentplayer->activemenumode = 1;
g_PlayersWithControl[g_Vars.currentplayernum] = false;

11
src/include/types.h
View File

@ -2447,12 +2447,11 @@ struct player {
/*0x1574*/ u32 unk1574;
/*0x1578*/ u32 unk1578;
/*0x157c*/ u32 unk157c;
union {
s8 unk1580;
s32 unk1580_s32;
};
/*0x1580*/ s8 unk1580;
/*0x1581*/ u8 unk1581;
/*0x1582*/ u8 unk1582;
/*0x1583*/ u8 unk1583_00 : 7;
/*0x1583*/ u8 unk1583_07 : 1;
/*0x1584*/ u32 unk1584;
/*0x1588*/ u32 unk1588;
/*0x158c*/ u32 unk158c;