diff --git a/desktop_version/fixupMac.sh b/desktop_version/fixupMac.sh new file mode 100755 index 00000000..8effd4f3 --- /dev/null +++ b/desktop_version/fixupMac.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# flibit has this solely for convenience when cleaning up Mac binaries. + +install_name_tool -change /usr/local/lib/libSDL2-2.0.0.dylib @rpath/libSDL2-2.0.0.dylib VVVVVV +install_name_tool -change /usr/local/lib/libSDL2_mixer-2.0.0.dylib @rpath/libSDL2_mixer-2.0.0.dylib VVVVVV +strip -S VVVVVV +otool -L VVVVVV diff --git a/desktop_version/src/Game.cpp b/desktop_version/src/Game.cpp index a29d1c8f..475ccce7 100644 --- a/desktop_version/src/Game.cpp +++ b/desktop_version/src/Game.cpp @@ -6874,7 +6874,7 @@ void Game::returntoingame(void) gamestate = MAPMODE; DEFER_CALLBACK(setflipmode); DEFER_CALLBACK(setfademode); - if (!map.custommode && !graphics.flipmode) + if (!map.custommode && !graphics.setflipmode) { obj.flags[73] = true; } diff --git a/desktop_version/src/Network.c b/desktop_version/src/Network.c index ad25d8bc..dc8a0112 100644 --- a/desktop_version/src/Network.c +++ b/desktop_version/src/Network.c @@ -56,7 +56,7 @@ static NetworkBackend backends[NUM_BACKENDS]; int NETWORK_init(void) { - int32_t any = 0; + int32_t i, any = 0; #define ASSIGN_BACKEND(name, index) \ backends[index].Init = name##_init; \ backends[index].Shutdown = name##_shutdown; \ @@ -72,7 +72,6 @@ int NETWORK_init(void) #endif #undef ASSIGN_BACKEND #if NUM_BACKENDS > 0 - int32_t i; for (i = 0; i < NUM_BACKENDS; i += 1) { backends[i].IsInit = backends[i].Init(); diff --git a/desktop_version/src/Render.cpp b/desktop_version/src/Render.cpp index 1a6f6ed0..b1b05369 100644 --- a/desktop_version/src/Render.cpp +++ b/desktop_version/src/Render.cpp @@ -159,7 +159,7 @@ static void menurender(void) #ifdef INTERIM_COMMIT graphics.Print( 310 - (SDL_arraysize(INTERIM_COMMIT) - 1) * 8, 220, INTERIM_COMMIT, tr/2, tg/2, tb/2); #endif - graphics.Print( 310 - (4*8), 230, "v2.3", tr/2, tg/2, tb/2); + graphics.Print( 310 - (6*8), 230, "v2.3.1", tr/2, tg/2, tb/2); if(music.mmmmmm){ graphics.Print( 10, 230, "[MMMMMM Mod Installed]", tr/2, tg/2, tb/2); diff --git a/desktop_version/src/Screen.cpp b/desktop_version/src/Screen.cpp index 654980b0..acf8dc33 100644 --- a/desktop_version/src/Screen.cpp +++ b/desktop_version/src/Screen.cpp @@ -24,7 +24,7 @@ ScreenSettings::ScreenSettings(void) windowWidth = 320; windowHeight = 240; fullscreen = false; - useVsync = false; + useVsync = true; // Now that uncapped is the default... stretch = 0; linearFilter = false; badSignal = false;