From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 1 May 2011 20:05:17 +0000 (+0000)
Subject: don't override dock icon on OSX
X-Git-Tag: xonotic-v0.5.0~238
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ca3e6c7efbc95bff6661c3fe6118e90793558c02;p=xonotic%2Fdarkplaces.git

don't override dock icon on OSX

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11087 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=63f8870823e80484fe6e58a3738c2e681860c7f1
---

diff --git a/vid_sdl.c b/vid_sdl.c
index 76cc2ac4..aa76d6df 100644
--- 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"