Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide other players in main menu

This commit is contained in:
MysterD 2021-07-30 18:47:09 -07:00
parent 1845f8aaaf
commit 033a9aa1a8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/mario.c
View File

@ -1867,9 +1867,10 @@ s32 execute_mario_action(UNUSED struct Object *o) {
s32 inLoop = TRUE; s32 inLoop = TRUE;
// hide inactive players // hide inactive players
struct NetworkPlayer* np = &gNetworkPlayers[gMarioState->playerIndex]; struct NetworkPlayer* np = &gNetworkPlayers[gMarioState->playerIndex];
if (gMarioState->playerIndex != 0 && gNetworkPlayerLocal != NULL) { if (gMarioState->playerIndex != 0) {
bool levelAreaMismatch = bool levelAreaMismatch =
(np->currCourseNum != gNetworkPlayerLocal->currCourseNum ((gNetworkPlayerLocal == NULL)
|| np->currCourseNum != gNetworkPlayerLocal->currCourseNum
|| np->currActNum != gNetworkPlayerLocal->currActNum || np->currActNum != gNetworkPlayerLocal->currActNum
|| np->currLevelNum != gNetworkPlayerLocal->currLevelNum || np->currLevelNum != gNetworkPlayerLocal->currLevelNum
|| np->currAreaIndex != gNetworkPlayerLocal->currAreaIndex); || np->currAreaIndex != gNetworkPlayerLocal->currAreaIndex);

8
src/pc/network/packets/packet.c
View File

@ -6,10 +6,10 @@ void packet_process(struct Packet* p) {
if (p->levelAreaMustMatch) { if (p->levelAreaMustMatch) {
extern s16 gCurrCourseNum, gCurrActStarNum, gCurrLevelNum, gCurrAreaIndex; extern s16 gCurrCourseNum, gCurrActStarNum, gCurrLevelNum, gCurrAreaIndex;
bool levelAreaMismatch = bool levelAreaMismatch =
(p->courseNum != gCurrCourseNum (p->courseNum != gCurrCourseNum
|| p->actNum != gCurrActStarNum || p->actNum != gCurrActStarNum
|| p->levelNum != gCurrLevelNum || p->levelNum != gCurrLevelNum
|| p->areaIndex != gCurrAreaIndex); || p->areaIndex != gCurrAreaIndex);
// drop packet // drop packet
if (levelAreaMismatch) { if (levelAreaMismatch) {
if (gNetworkType != NT_SERVER) { if (gNetworkType != NT_SERVER) {