Remove insidious F11 fullscreen toggle. That will never work under Windows.

git-svn-id: https://s.snth.net/svn/neverball/trunk@1281 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/ball/main.c b/ball/main.c
index 2085a1b..f9fb625 100644 (file)
--- a/ball/main.c
+++ b/ball/main.c
@@ -72,16 +72,6 @@ static void toggle_wire(void)
     }
 }
 
-static void toggle_fullscreen(void)
-{
-    int x, y;
-
-    SDL_GetMouseState(&x, &y);
-    config_mode(!config_get_d(CONFIG_FULLSCREEN), config_get_d(CONFIG_WIDTH),
-                config_get_d(CONFIG_HEIGHT));
-    SDL_WarpMouse(x, y);
-}
-
 /*---------------------------------------------------------------------------*/
 
 static int loop(void)
@@ -131,7 +121,6 @@ static int loop(void)
 
             else switch (c)
             {
-            case SDLK_F11:   toggle_fullscreen();       break;
             case SDLK_F10:   shot();                    break;
             case SDLK_F9:    config_tgl_d(CONFIG_FPS);  break;
             case SDLK_F8:    config_tgl_d(CONFIG_NICE); break;

diff --git a/ball/st_conf.c b/ball/st_conf.c
index b58fb41..d0e6e70 100644 (file)
--- a/ball/st_conf.c
+++ b/ball/st_conf.c
@@ -344,8 +344,6 @@ static int null_enter(void)
     shad_free();
     part_free();
 
-    glGetError();
-
     return 0;
 }
 

diff --git a/ball/st_help.c b/ball/st_help.c
index 959f8da..4e9008f 100644 (file)
--- a/ball/st_help.c
+++ b/ball/st_help.c
@@ -173,7 +173,6 @@ static int help_controls(int id)
     const char *s9 = _("Lazy View");
     const char *sA = _("Manual View");
     const char *sC = _("Screenshot");
-    const char *sD = _("Toggle Fullscreen");
 
     const char *k0 = _(SDL_GetKeyName(config_get_d(CONFIG_KEY_PAUSE)));
     const char *k1 = _("Escape");
@@ -181,7 +180,6 @@ static int help_controls(int id)
     const char *k3 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_2));
     const char *k4 = SDL_GetKeyName(config_get_d(CONFIG_KEY_CAMERA_3));
     const char *k6 = SDL_GetKeyName(SDLK_F10);
-    const char *k7 = SDL_GetKeyName(SDLK_F11);
 
     int jd;
 
@@ -217,11 +215,6 @@ static int help_controls(int id)
         gui_label(jd, sC, GUI_SML, 0,      gui_wht, gui_wht);
         gui_label(jd, k6, GUI_SML, 0,      gui_yel, gui_yel);
     }
-    if ((jd = gui_harray(id)))
-    {
-        gui_label(jd, sD, GUI_SML, GUI_SE, gui_wht, gui_wht);
-        gui_label(jd, k7, GUI_SML, GUI_SW, gui_yel, gui_yel);
-    }
 
     gui_space(id);
 

diff --git a/doc/MANUAL b/doc/MANUAL
index 15ecd7f..99e18d9 100644 (file)
--- a/doc/MANUAL
+++ b/doc/MANUAL
@@ -28,7 +28,6 @@ See below for details.
     F8     Toggle nice mode
     F9     Toggle frame counter
     F10    Snap a screenshot
-    F11    Toggle fullscreen
     F12    Toggle look-around mode