Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

port: correct HUD aspect in horizontal 2-player splitscreen too

Browse Source
This commit is contained in:
fgsfds committed 2023-12-17 12:52:11 +01:00
1 parent 94df3fc58c
commit 92c66c93dc
8 files changed
+21 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/activemenu.c
+2 -1
View File
@@ -1275,7 +1275,8 @@ Gfx *amRender(Gfx *gdl)
#endif #endif
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (PLAYERCOUNT() == 1) { const s32 playercount = PLAYERCOUNT();
if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT); gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
} }
#endif #endif
src/game/bondgun.c
+3 -3
View File
@@ -12797,7 +12797,7 @@ Gfx *bgunDrawHud(Gfx *gdl)
gdl = text0f153628(gdl); gdl = text0f153628(gdl);
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (playercount < 2) { if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeR); gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeR);
} }
#endif #endif
@@ -13051,7 +13051,7 @@ Gfx *bgunDrawHud(Gfx *gdl)
} }
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (playercount < 2) { if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeL); gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeL);
} }
#endif #endif
@@ -13091,7 +13091,7 @@ Gfx *bgunDrawHud(Gfx *gdl)
} }
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (playercount < 2) { if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeR); gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeR);
} }
#endif #endif
src/game/hudmsg.c
+4 -3
View File
@@ -190,7 +190,7 @@ Gfx *hudmsgRenderMissionTimer(Gfx *gdl, u32 alpha)
y = timery; y = timery;
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (PLAYERCOUNT() < 2) { if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeL); gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeL);
} }
#endif #endif
@@ -282,7 +282,7 @@ Gfx *hudmsgRenderZoomRange(Gfx *gdl, u32 alpha)
y2 = y + textheight; y2 = y + textheight;
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (playercount == 1) { if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT); gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
} }
#endif #endif
@@ -1450,7 +1450,8 @@ Gfx *hudmsgsRender(Gfx *gdl)
} }
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (playercount < 2 && msg->state >= HUDMSGSTATE_FADINGIN) { const bool doaspectfix = (playercount < 2) || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL);
if (doaspectfix && msg->state >= HUDMSGSTATE_FADINGIN) {
if (msg->alignh == HUDMSGALIGN_SCREENLEFT || msg->alignh == HUDMSGALIGN_LEFT) { if (msg->alignh == HUDMSGALIGN_SCREENLEFT || msg->alignh == HUDMSGALIGN_LEFT) {
gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeL); gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeL);
} else if (msg->alignh == HUDMSGALIGN_RIGHT) { } else if (msg->alignh == HUDMSGALIGN_RIGHT) {
src/game/mplayer/scenarios/holdthebriefcase.inc
+2 -1
View File
@@ -417,7 +417,8 @@ Gfx *htbRenderHud(Gfx *gdl)
#endif #endif
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (PLAYERCOUNT() == 1) { const s32 playercount = PLAYERCOUNT();
if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT); gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
} }
#endif #endif
src/game/mplayer/scenarios/kingofthehill.inc
+2 -1
View File
@@ -583,7 +583,8 @@ Gfx *kohRenderHud(Gfx *gdl)
} }
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (PLAYERCOUNT() == 1) { const s32 playercount = PLAYERCOUNT();
if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT); gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
} }
#endif #endif
src/game/mplayer/scenarios/popacap.inc
+2 -1
View File
@@ -312,7 +312,8 @@ Gfx *pacRenderHud(Gfx *gdl)
sprintf(text, "%d:%02d", mins, secs); sprintf(text, "%d:%02d", mins, secs);
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (PLAYERCOUNT() == 1) { const s32 playercount = PLAYERCOUNT();
if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT); gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
} }
#endif #endif
src/game/propobj.c
+1 -1
View File
@@ -20979,7 +20979,7 @@ Gfx *countdownTimerRender(Gfx *gdl)
ms = (s32)floorf(value60 * 1.6666666269302f) - mins * 6000 - secs * 100; ms = (s32)floorf(value60 * 1.6666666269302f) - mins * 6000 - secs * 100;
#ifndef PLATFORM_N64 #ifndef PLATFORM_N64
if (playercount == 1) { if (playercount < 2 || (playercount == 2 && optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL)) {
gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT); gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
} }
#endif #endif
src/game/radar.c
+5
View File
@@ -312,6 +312,11 @@ Gfx *radarRender(Gfx *gdl)
} else if (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && playernum == 1) { } else if (optionsGetScreenSplit() != SCREENSPLIT_VERTICAL && playernum == 1) {
g_RadarY -= 8; g_RadarY -= 8;
} }
#ifndef PLATFORM_N64
if (optionsGetScreenSplit() == SCREENSPLIT_HORIZONTAL) {
gSPExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT, g_HudAlignModeR);
}
#endif
} else if (playercount >= 3) { } else if (playercount >= 3) {
if (playernum >= 2) { if (playernum >= 2) {
g_RadarY -= 8; g_RadarY -= 8;