]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
don't override dock icon on OSX
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 1 May 2011 20:05:17 +0000 (20:05 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 1 May 2011 21:18:25 +0000 (23:18 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11087 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=63f8870823e80484fe6e58a3738c2e681860c7f1

vid_sdl.c

index 76cc2ac44a38d2b745e578edaec742e5046b13ea..aa76d6df50cf13943d0df9d49f45f9a7390ff378 100644 (file)
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -1850,6 +1850,15 @@ static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight,
        }
        return screen;
 }
+#elif defined(MACOSX)
+static SDL_Surface *VID_WrapSDL_SetVideoMode(int screenwidth, int screenheight, int screenbpp, int screenflags)
+{
+       SDL_Surface *screen = NULL;
+       SDL_WM_SetCaption( gamename, NULL );
+       screen = SDL_SetVideoMode(screenwidth, screenheight, screenbpp, screenflags);
+       // we don't use SDL_WM_SetIcon here because the icon in the .app should be used
+       return screen;
+}
 #else
 // Adding the OS independent XPM version --blub
 #include "darkplaces.xpm"