From 8b543bd50c40b0e5c6fdb246160f0b18e2405d63 Mon Sep 17 00:00:00 2001 From: driAn Date: Sat, 23 Aug 2008 09:33:32 +0000 Subject: [PATCH] removed test code git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@2357 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/physics.cpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/source/src/physics.cpp b/source/src/physics.cpp index bc47d762..747fe8cf 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -78,20 +78,6 @@ bool plcollide(physent *d, physent *o, float &headspace, float &hi, float &lo) return true; } -static playerent *p; -void plctest() -{ - p = newplayerent(); - players.add(p); - spawnplayer(p); - p->o = player1->o; - p->o.z += 15.0f; -} -void plcupdate() { p->lastupdate = lastmillis; } -COMMAND(plctest, ARG_NONE); -COMMAND(plcupdate, ARG_NONE); - - bool cornertest(int mip, int x, int y, int dx, int dy, int &bx, int &by, int &bs) // recursively collide with a mipmapped corner cube { sqr *w = wmip[mip]; @@ -235,7 +221,7 @@ bool collide(physent *d, bool spawn, float drop, float rise) if(spacehi<0) { if(spacehi<-0.1) return false; // hack alert! - if(spacelo>0.5f) d->o.z = hi-d->aboveeye; // glue to ceiling if in midair + if(spacelo>0.1f) d->o.z = hi-d->aboveeye; // glue to ceiling if in midair d->vel.z = 0; // cancel out jumping velocity }