popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

net: Use LOCALPLAYERCOUNT() for UI size determination

Browse Source
This commit is contained in:
GreaseMonkey committed 2024-02-09 09:10:33 +13:00
1 parent 634eecb35d
commit 44a67e60e8
2 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/endscreen.c
+6 -6
View File
@@ -1702,7 +1702,7 @@ void endscreenPushCoop(void)
// Failed or aborted // Failed or aborted
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3 || LOCALPLAYERCOUNT() >= 3
#endif #endif
) { ) {
menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN);
@@ -1713,7 +1713,7 @@ void endscreenPushCoop(void)
// Completed // Completed
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3 || LOCALPLAYERCOUNT() >= 3
#endif #endif
) { ) {
menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN);
@@ -1803,7 +1803,7 @@ void endscreenPushAnti(void)
// Bond - failed or aborted // Bond - failed or aborted
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3 || LOCALPLAYERCOUNT() >= 3
#endif #endif
) { ) {
menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN);
@@ -1814,7 +1814,7 @@ void endscreenPushAnti(void)
// Bond - completed // Bond - completed
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3 || LOCALPLAYERCOUNT() >= 3
#endif #endif
) { ) {
menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN);
@@ -1834,7 +1834,7 @@ void endscreenPushAnti(void)
// Anti - completed // Anti - completed
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3 || LOCALPLAYERCOUNT() >= 3
#endif #endif
) { ) {
menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN);
@@ -1845,7 +1845,7 @@ void endscreenPushAnti(void)
// Anti - failed or aborted // Anti - failed or aborted
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3 || LOCALPLAYERCOUNT() >= 3
#endif #endif
) { ) {
menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN);
src/game/mplayer/ingame.c
+1 -1
View File
@@ -802,7 +802,7 @@ void mpPushPauseDialog(void)
} else { } else {
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3 || LOCALPLAYERCOUNT() >= 3
#endif #endif
) { ) {
menuPushRootDialog(&g_2PMissionPauseVMenuDialog, MENUROOT_MPPAUSE); menuPushRootDialog(&g_2PMissionPauseVMenuDialog, MENUROOT_MPPAUSE);