From 6ca21e25655c55f8ebdb50e166ea95b5b82ff327 Mon Sep 17 00:00:00 2001 From: ac_stef Date: Fri, 3 Oct 2008 23:09:21 +0000 Subject: [PATCH] prevent flag from falling through at mapmodel boundaries git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2807 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index e0b3ebc9..7248ba1a 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -66,7 +66,7 @@ void renderentities() else if(e.type==CTF_FLAG && editmode) { s_sprintfd(path)("pickups/flags/%s", team_string(e.attr2)); - rendermodel(path, ANIM_FLAG|ANIM_LOOP, 0, 0, vec(e.x, e.y, (float)S(e.x, e.y)->floor), (float)((e.attr1+7)-(e.attr1+7)%15), 0, 120.0f); + rendermodel(path, ANIM_FLAG|ANIM_LOOP, 0, 0, vec(e.x, e.y, (float)S(e.x, e.y)->floor), (float)((e.attr1+7)-(e.attr1+7)%15), 0, 120.0f); } } if(m_flags) loopi(2) @@ -388,7 +388,8 @@ void flagdropped(int flag, short x, short y, short z) p.o.y = y; p.o.z = z; p.vel.z = -0.8f; - p.aboveeye = p.eyeheight = p.radius = 0.0f; + p.aboveeye = p.eyeheight = 0.0f; + p.radius = 0.1f; bool oldcancollide = false; if(f.actor)