From df81633cdd881dad1b3af295f85609e6df7e99e0 Mon Sep 17 00:00:00 2001 From: Alan Trulock Date: Thu, 4 Aug 2011 16:01:12 +0200 Subject: [PATCH] Incorrect reference to SDL_FRMEWORK There are two references to SDL_FRAMEWORK that should have been written FRAMEWORK_SDL. In CGame.cpp, I think the section should be removed in it's entirety as there is really no need for it and correcting the define results in failure when compiling. In init.cpp, correcting the define allows Mac OS X builds to assign a custom icon. If this is not fixed, the icon gets replaced every time the game is run. --- src/CGame.cpp | 10 ---------- src/init.cpp | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/CGame.cpp b/src/CGame.cpp index 96fdb7d..f58b81c 100644 --- a/src/CGame.cpp +++ b/src/CGame.cpp @@ -29,16 +29,6 @@ Game::Game() gore = 1; skill = 1; -#ifdef SDL_FRAMEWORK - float r,g,b; - if (SDL_GetGamma(&r, &g, &b) != -1) { - if (r != g || g != b) { - brightness = -1; - } else { - brightness = 10 * r; - } - } -#endif clear(); } diff --git a/src/init.cpp b/src/init.cpp index 6d2aa7c..4ed644a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -383,7 +383,7 @@ void initSystem() SDL_Surface *device = graphics.loadImage("gfx/main/alienDevice.png"); -#ifndef SDL_FRAMEWORK +#ifndef FRAMEWORK_SDL SDL_WM_SetIcon(device, NULL); #endif SDL_WM_SetCaption("Blob Wars : Metal Blob Solid", "Blob Wars"); -- 2.39.5