SDL: Remove defunct -fullscreen argument

This closes issue #16
milkytracker · Jul 8, 2015 · 85b00bc · 85b00bc
1 parent 78386ff
commit 85b00bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/docs/readme_unix b/docs/readme_unix
@@ -78,7 +78,6 @@ are the following command line options:
 -bpp N        Set N to either 16 or 24
 -swap         Swaps the red and blue values in 24 BPP mode
 -orientation  Valid arguments are NORMAL|ROTATE90CCW|ROTATE90CW
--fullscreen   Does what it says
 
 The screen size can be selected in the Config->Layout menu.  Fullscreen mode can
 be toggled using ALT+Return.  Note that these arguments are likely to be removed

diff --git a/src/tracker/sdl/SDL_Main.cpp b/src/tracker/sdl/SDL_Main.cpp
@@ -840,9 +840,9 @@ void crashHandler(int signum)
 #endif
 
 void initTracker(pp_uint32 bpp, PPDisplayDevice::Orientations orientation, 
-				 bool swapRedBlue, bool fullScreen, bool noSplash)
+				 bool swapRedBlue, bool noSplash)
 {
-	/* Initialize SDL */
+    /* Initialize SDL */
 	if ( SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) < 0 ) 
 	{
 		fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError());
@@ -896,8 +896,7 @@ void initTracker(pp_uint32 bpp, PPDisplayDevice::Orientations orientation,
 	myTracker = new Tracker();
 
 	PPSize windowSize = myTracker->getWindowSizeFromDatabase();
- 	if (!fullScreen) 
-		fullScreen = myTracker->getFullScreenFlagFromDatabase();
+	bool fullScreen = myTracker->getFullScreenFlagFromDatabase();
 	pp_int32 scaleFactor = myTracker->getScreenScaleFactorFromDatabase();
 
 #ifdef __LOWRES__
@@ -986,7 +985,7 @@ int main(int argc, char *argv[])
 
 	pp_int32 defaultBPP = -1;
 	PPDisplayDevice::Orientations orientation = PPDisplayDevice::ORIENTATION_NORMAL;
-	bool swapRedBlue = false, fullScreen = false, noSplash = false;
+	bool swapRedBlue = false, noSplash = false;
 	bool recVelocity = false;
 
 	// Parse command line
@@ -1006,10 +1005,6 @@ int main(int argc, char *argv[])
 		{
 			swapRedBlue = true;
 		}
-		else if ( strcmp(argv[argc], "-fullscreen") == 0)
-		{
-			fullScreen = true;
-		}
 		else if ( strcmp(argv[argc-1], "-orientation") == 0 ) 
 		{
 			if (strcmp(argv[argc], "NORMAL") == 0)
@@ -1042,7 +1037,7 @@ int main(int argc, char *argv[])
 			if (argv[argc][0] == '-') 
 			{
 				fprintf(stderr, 
-						"Usage: %s [-bpp N] [-swap] [-orientation NORMAL|ROTATE90CCW|ROTATE90CW] [-fullscreen] [-nosplash] [-nonstdkb] [-recvelocity]\n", argv[0]);
+						"Usage: %s [-bpp N] [-swap] [-orientation NORMAL|ROTATE90CCW|ROTATE90CW] [-nosplash] [-nonstdkb] [-recvelocity]\n", argv[0]);
 				exit(1);
 			} 
 			else 
@@ -1066,7 +1061,7 @@ int main(int argc, char *argv[])
 	PPSystemString oldCwd = path.getCurrent();
 
 	globalMutex->lock();
-	initTracker(defaultBPP, orientation, swapRedBlue, fullScreen, noSplash);
+	initTracker(defaultBPP, orientation, swapRedBlue, noSplash);
 	globalMutex->unlock();
 
 #ifdef HAVE_LIBASOUND