From fdf4f2d74ba917ce0e138798ead09892e69add62 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 28 Mar 2016 05:15:27 +0000
Subject: [PATCH] Fix warnings pointed out by Xcode.

git-svn-id: https://svn.eduke32.com/eduke32@5678 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/sdlayer.c  | 2 ++
 polymer/eduke32/build/src/texcache.c | 2 +-
 polymer/eduke32/source/menus.c       | 6 ++----
 polymer/eduke32/source/sbar.h        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index 413909dc1..0f16d1b83 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -94,7 +94,9 @@ char modechange=1;
 char offscreenrendering=0;
 char videomodereset = 0;
 int32_t nofog=0;
+#ifndef EDUKE32_GLES
 static uint16_t sysgamma[3][256];
+#endif
 extern int32_t curbrightness, gammabrightness;
 #ifdef USE_OPENGL
 // OpenGL stuff
diff --git a/polymer/eduke32/build/src/texcache.c b/polymer/eduke32/build/src/texcache.c
index 3b987e0f9..f76697d76 100644
--- a/polymer/eduke32/build/src/texcache.c
+++ b/polymer/eduke32/build/src/texcache.c
@@ -692,13 +692,13 @@ static void texcache_setuptexture(int32_t *doalloc, GLuint *glpic)
 
 static int32_t texcache_loadmips(const texcacheheader *head, GLenum *glerr)
 {
-    int32_t level = 0;
     texcachepicture pict;
     char *pic = NULL, *packbuf = NULL;
     void *midbuf = NULL;
     int32_t alloclen=0;
 
 #ifndef EDUKE32_GLES
+    int32_t level = 0;
     for (level = 0; level==0 || (pict.xdim > 1 || pict.ydim > 1); level++)
 #endif
     {
diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index 1835c7045..824cc2981 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -284,8 +284,8 @@ MAKE_MENU_TOP_ENTRYLINK( "Load Game", MEF_MainMenu, MAIN_LOADGAME, MENU_LOAD );
 MAKE_MENU_TOP_ENTRYLINK( "Options", MEF_MainMenu, MAIN_OPTIONS, MENU_OPTIONS );
 #ifndef DROIDMENU
 MAKE_MENU_TOP_ENTRYLINK( "Help", MEF_MainMenu, MAIN_HELP, MENU_STORY );
-#endif
 MAKE_MENU_TOP_ENTRYLINK( "Credits", MEF_MainMenu, MAIN_CREDITS, MENU_CREDITS );
+#endif
 MAKE_MENU_TOP_ENTRYLINK( "End Game", MEF_MainMenu, MAIN_QUITTOTITLE, MENU_QUITTOTITLE );
 MAKE_MENU_TOP_ENTRYLINK( "Quit", MEF_MainMenu, MAIN_QUIT, MENU_QUIT );
 #ifndef DROIDMENU
@@ -416,8 +416,6 @@ MAKE_MENU_TOP_ENTRYLINK( "Mouse Setup", MEF_CenterMenu, OPTIONS_MOUSESETUP, MENU
 MAKE_MENU_TOP_ENTRYLINK( "Joystick Setup", MEF_CenterMenu, OPTIONS_JOYSTICKSETUP, MENU_JOYSTICKSETUP );
 #ifdef DROIDMENU
 MAKE_MENU_TOP_ENTRYLINK( "Touch Setup", MEF_CenterMenu, OPTIONS_TOUCHSETUP, MENU_TOUCHSETUP );
-MAKE_MENU_TOP_ENTRYLINK( "Touch Sensitivity", MEF_CenterMenu, OPTIONS_TOUCHSENS, MENU_TOUCHSENS);
-MAKE_MENU_TOP_ENTRYLINK( "Touch Buttons", MEF_CenterMenu, OPTIONS_TOUCHBUTTONS, MENU_TOUCHBUTTONS);
 #endif
 
 static int32_t newresolution, newrendermode, newfullscreen, newvsync;
@@ -477,12 +475,12 @@ static MenuOption_t MEO_DISPLAYSETUP_PIXELDOUBLING = MAKE_MENUOPTION( &MF_Redfon
 static MenuEntry_t ME_DISPLAYSETUP_PIXELDOUBLING = MAKE_MENUENTRY( "Pixel Doubling:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_PIXELDOUBLING, Option );
 
 
+#ifndef DROIDMENU
 #ifdef USE_OPENGL
 static MenuOption_t MEO_DISPLAYSETUP_ASPECTRATIO = MAKE_MENUOPTION(&MF_Redfont, &MEOS_OffOn, NULL);
 #else
 static MenuOption_t MEO_DISPLAYSETUP_ASPECTRATIO = MAKE_MENUOPTION(&MF_Redfont, &MEOS_OffOn, &r_usenewaspect);
 #endif
-#ifndef DROIDMENU
 static MenuEntry_t ME_DISPLAYSETUP_ASPECTRATIO = MAKE_MENUENTRY( "Widescreen:", &MF_Redfont, &MEF_BigOptionsRt, &MEO_DISPLAYSETUP_ASPECTRATIO, Option );
 #endif
 #ifdef POLYMER
diff --git a/polymer/eduke32/source/sbar.h b/polymer/eduke32/source/sbar.h
index 4ffa52269..1c88d3e4d 100644
--- a/polymer/eduke32/source/sbar.h
+++ b/polymer/eduke32/source/sbar.h
@@ -31,4 +31,4 @@ int32_t sbarsc(int32_t sc);
 int32_t sbarx16(int32_t x);
 int32_t sbary16(int32_t y);
 void G_DrawInventory(const DukePlayer_t *p);
-void G_DrawStatusBar(int32_t snum);
\ No newline at end of file
+void G_DrawStatusBar(int32_t snum);