From 34495cad868a5cfdcb4705cbcd6dc1ef52f941b5 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sun, 17 Feb 2008 09:03:32 +0000 Subject: [PATCH] gcc warning fix git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1662 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 165ddd0d..21347bf0 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -315,12 +315,12 @@ void flagdropped(int flag, int action, short x, short y, short z) p.rotspeed = 0.0f; p.o.x = x; p.o.y = y; - p.o.z = (short)floor(x, y); + p.o.z = floor(x, y); p.vel.z = -1.0f; loopi(50) moveplayer(&p, 50, true); // calc drop position - f.flag->x = p.o.x; - f.flag->y = p.o.y; - f.flag->z = p.o.z; + f.flag->x = (short)p.o.x; + f.flag->y = (short)p.o.y; + f.flag->z = (short)p.o.z; if(f.flag->z < hdr.waterlevel) f.flag->z = (short) hdr.waterlevel; f.flag->spawned = true; f.ack = true;