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

Use vertical-split versions of menus in 3+-player main missions

Browse Source 
These work fine in the 2x2 split arrangement.
This commit is contained in:
GreaseMonkey committed 2024-02-09 08:40:02 +13:00
1 parent a0db91a0c9
commit 634eecb35d
2 files changed
+35 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/endscreen.c
+30 -6
View File
@@ -1700,14 +1700,22 @@ void endscreenPushCoop(void)
#endif #endif
{ {
// Failed or aborted // Failed or aborted
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3
#endif
) {
menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN);
} else { } else {
menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN);
} }
} else { } else {
// Completed // Completed
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3
#endif
) {
menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN);
} else { } else {
menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN);
@@ -1793,14 +1801,22 @@ void endscreenPushAnti(void)
#endif #endif
{ {
// Bond - failed or aborted // Bond - failed or aborted
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3
#endif
) {
menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN);
} else { } else {
menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN);
} }
} else { } else {
// Bond - completed // Bond - completed
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3
#endif
) {
menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN);
} else { } else {
menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN);
@@ -1816,14 +1832,22 @@ void endscreenPushAnti(void)
#endif #endif
{ {
// Anti - completed // Anti - completed
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3
#endif
) {
menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedVMenuDialog, MENUROOT_MPENDSCREEN);
} else { } else {
menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenCompletedHMenuDialog, MENUROOT_MPENDSCREEN);
} }
} else { } else {
// Anti - failed or aborted // Anti - failed or aborted
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3
#endif
) {
menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedVMenuDialog, MENUROOT_MPENDSCREEN);
} else { } else {
menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN); menuPushRootDialog(&g_2PMissionEndscreenFailedHMenuDialog, MENUROOT_MPENDSCREEN);
src/game/mplayer/ingame.c
+5 -1
View File
@@ -800,7 +800,11 @@ void mpPushPauseDialog(void)
menuPushRootDialog(&g_MpPausePlayerRankingMenuDialog, MENUROOT_MPPAUSE); menuPushRootDialog(&g_MpPausePlayerRankingMenuDialog, MENUROOT_MPPAUSE);
} }
} else { } else {
if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) { if (optionsGetScreenSplit() == SCREENSPLIT_VERTICAL
#ifndef PLATFORM_N64
|| PLAYERCOUNT() >= 3
#endif
) {
menuPushRootDialog(&g_2PMissionPauseVMenuDialog, MENUROOT_MPPAUSE); menuPushRootDialog(&g_2PMissionPauseVMenuDialog, MENUROOT_MPPAUSE);
} else { } else {
menuPushRootDialog(&g_2PMissionPauseHMenuDialog, MENUROOT_MPPAUSE); menuPushRootDialog(&g_2PMissionPauseHMenuDialog, MENUROOT_MPPAUSE);