From fb831f2cadaac9980a1ce65553c440d89dbf57bb Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 1 Apr 2007 23:16:48 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@879 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/renderextras.cpp | 13 ++++++------- source/src/rendergl.cpp | 2 -- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/source/src/renderextras.cpp b/source/src/renderextras.cpp index e5f941c1..36101ec0 100644 --- a/source/src/renderextras.cpp +++ b/source/src/renderextras.cpp @@ -356,7 +356,6 @@ void drawradar(const vec ¢er, int radarres, int w, int h, bool fullscreen) { glPushMatrix(); glDisable(GL_BLEND); - glOrtho(0, VIRTW, VIRTH, 0, -1, 1); const float worldsize = (float)ssize; const float radarviewsize = fullscreen ? VIRTH : VIRTH/6; @@ -448,18 +447,18 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat drawequipicons(); + if(!hideradar) + { + if(showmap) drawradar(vec(ssize/2, ssize/2, 0), ssize, w, h, true); + else drawradar(player1->o, radarres, w, h, false); + } + if(getcurcommand()) rendercommand(20, 1570); else if(closeent[0]) draw_text(closeent, 20, 1570); else if(targetplayer) draw_text(targetplayer->name, 20, 1570); glPopMatrix(); - if(!hideradar) - { - if(showmap) drawradar(vec(ssize/2, ssize/2, 0), ssize, w, h, true); - else drawradar(player1->o, radarres, w, h, false); - } - glPushMatrix(); glOrtho(0, VIRTW*2, VIRTH*2, 0, -1, 1); renderconsole(); diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index f6cb4736..d4cd33b7 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -341,8 +341,6 @@ bool outsidemap(physent *pl) || pl->o.z > s->ceil + (s->type==CHF ? s->vdelta/4 : 0); } -VAR(foo, 0, 0, 1); - void gl_drawframe(int w, int h, float changelod, float curfps) { recomputecamera();