thank you git very cool

This commit is contained in:
fgsfds committed 2025-01-05 12:44:51 +01:00
1 parent c597915466
commit 839ef7cc44
1 file changed
+1 -5
+1 -5
View File
@@ -115,16 +115,12 @@ void gfxReset(void)
// ******** Original Amount required = %dK ber buffer\n
// ******** Extra Amount required = %dK ber buffer\n
// ******** Total of %dK (Double Buffered)\n
<<<<<<< HEAD
g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1] = gfx + gfxtra;
g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1] = (gfx + gfxtra) * GFX_SIZE_MULTIPLIER;
#ifndef PLATFORM_N64
if (PLAYERCOUNT() > MAX_LOCAL_PLAYERS) {
g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1] *= MAX_PLAYERS / MAX_LOCAL_PLAYERS;
}
#endif
=======
g_GfxSizesByPlayerCount[PLAYERCOUNT() - 1] = (gfx + gfxtra) * GFX_SIZE_MULTIPLIER;
>>>>>>> 49cd478622e3fefdd5c60fbd314ef8185d0cbf9d
}
if (argFindByPrefix(1, "-mvtx")) {