From b932485a1d0e0c4b0406481b515fbb1883d71200 Mon Sep 17 00:00:00 2001 From: terminx Date: Mon, 23 Apr 2018 06:36:14 +0000 Subject: [PATCH] macOS build fix git-svn-id: https://svn.eduke32.com/eduke32@6855 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/build/src/startosx.editor.mm | 8 ++++---- source/duke3d/src/startosx.game.mm | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/build/src/startosx.editor.mm b/source/build/src/startosx.editor.mm index cf51f1ab0..0366a0284 100644 --- a/source/build/src/startosx.editor.mm +++ b/source/build/src/startosx.editor.mm @@ -424,7 +424,7 @@ static struct { } - mode2d = checkvideomode(&xdim2d, &ydim2d, bpp2d, fullscreen, 1); + mode2d = videoCheckMode(&xdim2d, &ydim2d, bpp2d, fullscreen, 1); [modeslist2d release]; [videoMode2DPUButton removeAllItems]; @@ -443,12 +443,12 @@ static struct { if (idx2d >= 0) [videoMode2DPUButton selectItemAtIndex:idx2d]; - mode3d = checkvideomode(&xdim, &ydim, bpp, fullscreen, 1); + mode3d = videoCheckMode(&xdim, &ydim, bpp, fullscreen, 1); if (mode3d < 0) { int i, cd[] = { 32, 24, 16, 15, 8, 0 }; for (i=0; cd[i]; ) { if (cd[i] >= bpp) i++; else break; } for ( ; cd[i]; i++) { - mode3d = checkvideomode(&xdim, &ydim, cd[i], fullscreen, 1); + mode3d = videoCheckMode(&xdim, &ydim, cd[i], fullscreen, 1); if (mode3d < 0) continue; break; } @@ -511,7 +511,7 @@ static struct { - (void)setupRunMode { - getvalidmodes(); + videoGetModes(); [fullscreenButton setState: (settings.fullscreen ? NSOnState : NSOffState)]; [alwaysShowButton setState: (settings.forcesetup ? NSOnState : NSOffState)]; diff --git a/source/duke3d/src/startosx.game.mm b/source/duke3d/src/startosx.game.mm index 45f267032..ea85ddb5e 100644 --- a/source/duke3d/src/startosx.game.mm +++ b/source/duke3d/src/startosx.game.mm @@ -442,12 +442,12 @@ static struct { } } - mode3d = checkvideomode(&xdim, &ydim, bpp, fullscreen, 1); + mode3d = videoCheckMode(&xdim, &ydim, bpp, fullscreen, 1); if (mode3d < 0) { int i, cd[] = { 32, 24, 16, 15, 8, 0 }; for (i=0; cd[i]; ) { if (cd[i] >= bpp) i++; else break; } for ( ; cd[i]; i++) { - mode3d = checkvideomode(&xdim, &ydim, cd[i], fullscreen, 1); + mode3d = videoCheckMode(&xdim, &ydim, cd[i], fullscreen, 1); if (mode3d < 0) continue; break; } @@ -508,7 +508,7 @@ static struct { - (void)setupRunMode { - getvalidmodes(); + videoGetModes(); [fullscreenButton setState: (settings.fullscreen ? NSOnState : NSOffState)]; [alwaysShowButton setState: (settings.forcesetup ? NSOnState : NSOffState)];