Merge remote-tracking branch 'base/port' into port

src/game/mplayer/scenarios/holdthebriefcase.inc

@@ -416,6 +416,12 @@ Gfx *htbRenderHud(Gfx *gdl)
 		sprintf(text, "%d:%02d", mins, secs);
 #endif
 
+#ifndef PLATFORM_N64
+		if (PLAYERCOUNT() == 1) {
+			gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
+		}
+#endif
+
 		gdl = text0f153628(gdl);
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 
@@ -432,6 +438,10 @@ Gfx *htbRenderHud(Gfx *gdl)
 #endif
 
 		gdl = text0f153780(gdl);
+
+#ifndef PLATFORM_N64
+		gSPClearExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT);
+#endif
 	}
 
 	return gdl;

src/game/mplayer/scenarios/kingofthehill.inc

@@ -582,6 +582,12 @@ Gfx *kohRenderHud(Gfx *gdl)
 			sprintf(text, "%02d", secs);
 		}
 
+#ifndef PLATFORM_N64
+		if (PLAYERCOUNT() == 1) {
+			gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
+		}
+#endif
+
 		gdl = text0f153628(gdl);
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 
@@ -597,6 +603,10 @@ Gfx *kohRenderHud(Gfx *gdl)
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0);
 #endif
 		gdl = text0f153780(gdl);
+
+#ifndef PLATFORM_N64
+		gSPClearExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT);
+#endif
 	}
 
 	return gdl;

src/game/mplayer/scenarios/popacap.inc

@@ -311,6 +311,12 @@ Gfx *pacRenderHud(Gfx *gdl)
 		secs = (time240 + (TICKS(240) - 1)) / TICKS(240);
 		sprintf(text, "%d:%02d", mins, secs);
 
+#ifndef PLATFORM_N64
+		if (PLAYERCOUNT() == 1) {
+			gSPSetExtraGeometryModeEXT(gdl++, G_ASPECT_CENTER_EXT);
+		}
+#endif
+
 		gdl = text0f153628(gdl);
 		textMeasure(&textheight, &textwidth, text, g_CharsHandelGothicXs, g_FontHandelGothicXs, 0);
 
@@ -326,6 +332,10 @@ Gfx *pacRenderHud(Gfx *gdl)
 		gdl = textRender(gdl, &x, &y, text, g_CharsNumeric, g_FontNumeric, 0x00ff00a0, 0x88, viGetWidth(), viGetHeight(), 0, 0);
 #endif
 		gdl = text0f153780(gdl);
+
+#ifndef PLATFORM_N64
+		gSPClearExtraGeometryModeEXT(gdl++, G_ASPECT_MODE_EXT);
+#endif
 	}
 
 	return gdl;