kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flag dropping, proper position rounding

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2351 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-08-22 18:59:13 +00:00
parent e39f6dabe6
commit 5efdaf915a
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+15 -5
View File
@@ -331,14 +331,24 @@ void flagdropped(int flag, int action, short x, short y, short z)
p.o.y = y;
p.o.z = z;
p.vel.z = -0.8f;
loopi(100)
p.aboveeye = p.eyeheight = p.radius = 0.0f;
bool oldcancollide = false;
if(f.actor)
{
moveplayer(&p, 10, true, 50); // calc drop position
oldcancollide = f.actor->cancollide;
f.actor->cancollide = false; // avoid collision with owner
}
loopi(100) // perform physics steps
{
moveplayer(&p, 10, true, 50);
if(p.stuck) break;
}
f.flag->x = (short)p.o.x;
f.flag->y = (short)p.o.y;
f.flag->z = (short)p.o.z;
if(f.actor) f.actor->cancollide = oldcancollide; // restore settings
f.flag->x = (short)round(p.o.x);
f.flag->y = (short)round(p.o.y);
f.flag->z = (short)round(p.o.z);
if(f.flag->z < hdr.waterlevel) f.flag->z = (short) hdr.waterlevel;
f.flag->spawned = true;
f.ack = true;