From 2ad7aa7111aba3feb3b60367e829fb849467d826 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Tue, 14 Oct 2008 18:33:26 +0000 Subject: [PATCH] flag drop height fix (no longer uses eye pos) git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3011 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clients2c.cpp | 6 +++--- source/src/entities.cpp | 2 +- source/src/server.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp index 58b81c3e..33658dba 100644 --- a/source/src/clients2c.cpp +++ b/source/src/clients2c.cpp @@ -561,9 +561,9 @@ void parsemessages(int cn, playerent *d, ucharbuf &p) break; case CTFF_DROPPED: { - short x = (ushort) (getint(p)/DMF); - short y = (ushort) (getint(p)/DMF); - short z = ((ushort) (getint(p)/DMF))-((short)player1->eyeheight); // correct z offset, assumes all players do have the same eyeheight + short x = getuint(p)/DMF; + short y = getuint(p)/DMF; + short z = getuint(p)/DMF; flagdropped(flag, x, y, z); break; } diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 54dd35ba..ebe16613 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -342,7 +342,7 @@ void flagdropped(int flag, short x, short y, short z) p.rotspeed = 0.0f; p.o.x = x; p.o.y = y; - p.o.z = z + 5; + p.o.z = z; p.vel.z = -0.8f; p.aboveeye = p.eyeheight = p.maxeyeheight = 0.4f; p.radius = 0.1f; diff --git a/source/src/server.cpp b/source/src/server.cpp index f5c33ec0..77af6264 100644 --- a/source/src/server.cpp +++ b/source/src/server.cpp @@ -860,7 +860,7 @@ void putflaginfo(ucharbuf &p, int flag) putint(p, f.actor_cn); break; case CTFF_DROPPED: - loopi(3) putint(p, int(f.pos[i]*DMF)); + loopi(3) putuint(p, uint(f.pos[i]*DMF)); break; } }