From 3d28c2be86378e70218895889a332966b2ba3aa0 Mon Sep 17 00:00:00 2001 From: flowtron Date: Fri, 25 Jun 2010 20:16:05 +0000 Subject: [PATCH] fix DIV-by-0 bug (re:fps display) git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5233 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/main.cpp | 2 +- source/src/rendergl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/main.cpp b/source/src/main.cpp index 0e0d7f29..6cd42447 100644 --- a/source/src/main.cpp +++ b/source/src/main.cpp @@ -954,7 +954,7 @@ int main(int argc, char **argv) serverslice(0); - fps = (1000.0f/elapsed+fps*10)/11; + if(elapsed) fps = (1000.0f/elapsed+fps*10)/11; // avoid DIV-by-0 frames++; audiomgr.updateaudio(); diff --git a/source/src/rendergl.cpp b/source/src/rendergl.cpp index 15359144..bc3df903 100644 --- a/source/src/rendergl.cpp +++ b/source/src/rendergl.cpp @@ -272,7 +272,7 @@ void blendbox(int x1, int y1, int x2, int y2, bool border, int tex, color *c) if(tex>=0) { glBindTexture(GL_TEXTURE_2D, tex); - if(c) + if(c) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glColor4f(c->r, c->g, c->b, c->alpha); @@ -1027,7 +1027,7 @@ void gl_drawframe(int w, int h, float changelod, float curfps) } extern vector verts; - gl_drawhud(w, h, (int)round(curfps), nquads, verts.length(), underwater); + gl_drawhud(w, h, (int)roundf(curfps), nquads, verts.length(), underwater); glEnable(GL_CULL_FACE); glEnable(GL_FOG);