From cbad2f19b254f6229aec7e751d97a03d17f2e9ca Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 20 Nov 2007 18:31:41 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1438 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/menus.cpp | 4 ++-- source/src/renderhud.cpp | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/source/src/menus.cpp b/source/src/menus.cpp index 808d254c..06301cbb 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -63,7 +63,7 @@ bool menuvisible() { menustack.setsize(0); return false; - }; + } return true; } @@ -268,7 +268,7 @@ bool menukey(int code, bool isdown) int n = curmenu->items.length(), menusel = curmenu->menusel; if(isdown) { - int pagesize = MAXMENU - (curmenu->header ? 1 : 0) - (curmenu->footer ? 1 : 0); + int pagesize = MAXMENU - (curmenu->header ? 2 : 0) - (curmenu->footer ? 2 : 0); if(code==SDLK_PAGEUP) menusel -= pagesize; else if(code==SDLK_PAGEDOWN) { diff --git a/source/src/renderhud.cpp b/source/src/renderhud.cpp index b43861fe..41b34ae4 100644 --- a/source/src/renderhud.cpp +++ b/source/src/renderhud.cpp @@ -242,25 +242,21 @@ void drawradar(int w, int h) if(!showmap) { - glDisable(GL_CULL_FACE); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glColor3f(1, 1, 1); static Texture *overlaytex = NULL; if(!overlaytex) overlaytex = textureload("packages/misc/radaroverlays.png", 3); quad(overlaytex->id, VIRTW-overlaysize-10, 10, overlaysize, m_teammode ? 0.5f*team_int(player1->team) : 0, m_teammode ? 0 : 0.5f, 0.5f, 0.5f); - glEnable(GL_CULL_FACE); } } void drawteamicons(int w, int h) { - glDisable(GL_CULL_FACE); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glColor3f(1, 1, 1); static Texture *icons = NULL; if(!icons) icons = textureload("packages/misc/teamicons.png"); quad(icons->id, VIRTW-VIRTH/12-10, 10, VIRTH/12, team_int(player1->team) ? 0.5f : 0, 0, 0.5f, 0.5f); - glEnable(GL_CULL_FACE); } void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwater)