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.

diff --git a/src/CGame.cpp b/src/CGame.cpp
index 96fdb7d18b430fc5445208e134db904601db4902..f58b81cf1cda63f41e815c94ff77f22d94f33850 100644 (file)
--- 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 6d2aa7c3e24ae44b7f39341849d5144986d16e2b..4ed644a0ff3cd04891ef3fa57295048b43238db1 100644 (file)
--- 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");