Remove GLSL version from debug menu

diff --git a/src/client/debug_menu.c b/src/client/debug_menu.c
index d7ced2aaf722325545029c40a046251cc9a913ef..c2c2a13c0b5badc2bcc9d2dec0a2f2163758e4e5 100644 (file)
--- a/src/client/debug_menu.c
+++ b/src/client/debug_menu.c
@@ -22,7 +22,6 @@ typedef enum
        DME_FULLSCREEN,
        DME_OPENGL,
        DME_GPU,
-       DME_GLSL,
        DME_COUNT,
 } DebugMenuEntry;
 
@@ -141,11 +140,3 @@ void debug_menu_update_gpu()
        sprintf(text, "%s", glGetString(GL_RENDERER));
        hud_change_text(huds[DME_GPU], text);
 }
-
-void debug_menu_update_glsl()
-{
-       char text[BUFSIZ];
-       sprintf(text, "GLSL %s", glGetString(GL_SHADING_LANGUAGE_VERSION));
-       hud_change_text(huds[DME_GLSL], text);
-}
-

diff --git a/src/client/debug_menu.h b/src/client/debug_menu.h
index 4a8ab58cffa6572b6e25162a644d64dbb3677f30..db8cbe9c930a78c1d930c1b2a6e4401ccc98051f 100644 (file)
--- a/src/client/debug_menu.h
+++ b/src/client/debug_menu.h
@@ -18,6 +18,5 @@ void debug_menu_update_collision();
 void debug_menu_update_fullscreen();
 void debug_menu_update_opengl();
 void debug_menu_update_gpu();
-void debug_menu_update_glsl();
 
 #endif

diff --git a/src/client/game.c b/src/client/game.c
index 4368b122d00e7938f466f1128bf6d73e46a07a29..6bcd3d0a02a8f0dd8635e005b1dc218d0ca34d0f 100644 (file)
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -109,7 +109,6 @@ bool game(Client *client)
        debug_menu_update_fullscreen();
        debug_menu_update_opengl();
        debug_menu_update_gpu();
-       debug_menu_update_glsl();
 
        crosshair_init();
 

diff --git a/src/debug.sh b/src/debug.sh
index 88dc3fa76aaccdd846aed4bd254f46e9fdc515cc..400d2143c4c14d7bd182743b6aa96eaa5aaf8c92 100755 (executable)
--- a/src/debug.sh
+++ b/src/debug.sh
@@ -12,7 +12,7 @@ COMMON="set confirm off
 handle SIGTERM nostop print pass
 handle SIGPIPE nostop noprint pass
 set height 0
-set \$_exitcode 1
+set \$_exitcode=1
 define hook-stop
     if \$_exitcode == 0
         quit