From 562619c68e02531d838b893f84671522b9054be8 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Thu, 6 Nov 2008 09:54:47 +0000 Subject: [PATCH] pickup height fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3417 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 166091a8..aa794ae9 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -241,6 +241,7 @@ void checkitems(playerent *d) if(e.type==CTF_FLAG) continue; // simple 2d collision vec v(e.x, e.y, S(e.x, e.y)->floor+eyeheight); + if(isitem(e.type)) v.z += e.attr1; if(d->o.dist(v)<2.5f) trypickup(i, d); } if(m_flags) loopi(2)