From 62c2a9650fd502f0fd1e8967e5a3046b41e82415 Mon Sep 17 00:00:00 2001 From: ac_stef Date: Mon, 10 Nov 2008 00:41:41 +0000 Subject: [PATCH] fix invisible flags in htf on maps without flag bases git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3479 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 3cccc7ee..be689d94 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -51,11 +51,11 @@ void renderclip(entity &e) glVertex3f(bbmin.x, bbmin.y, bbmax.z); loopi(8) glVertex3f(i&2 ? bbmax.x : bbmin.x, i&4 ? bbmax.y : bbmin.y, i&1 ? bbmax.z : bbmin.z); - + glEnd(); glEnable(GL_TEXTURE_2D); } - + void renderentities() { if(editmode && !reflecting && !refracting && !stenciling) @@ -107,9 +107,9 @@ void renderentities() switch(f.state) { case CTFF_STOLEN: - if(OUTBORD(f.pos.x, f.pos.y)) break; if(f.actor && f.actor != player1) { + if(OUTBORD(f.actor->o.x, f.actor->o.y)) break; s_sprintfd(path)("pickups/flags/small_%s%s", m_ktf ? "" : team_string(i), m_htf ? "_htf" : m_ktf ? "ktf" : ""); rendermodel(path, ANIM_FLAG|ANIM_START|ANIM_DYNALLOC, 0, 0, vec(f.actor->o).add(vec(0, 0, 0.3f+(sinf(lastmillis/100.0f)+1)/10)), lastmillis/2.5f, 0, 120.0f); }