From c1449e99c82550e5fe33314618d82dd585376d56 Mon Sep 17 00:00:00 2001 From: Lee Salzman Date: Sat, 24 Mar 2007 05:49:01 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@865 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 2 +- source/src/physics.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index df3e9182..e90be0e3 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -600,7 +600,7 @@ void startmap(char *name) // called just after a map load setvar("fogcolour", 0x8099B3); showscores(false); intermission = false; - conoutf("game mode is \"%s\"", modestr(gamemode)); + if(*clientmap) conoutf("game mode is \"%s\"", modestr(gamemode)); clearbounceents(); }; diff --git a/source/src/physics.cpp b/source/src/physics.cpp index 25f55c54..893cec83 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -272,14 +272,14 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime) if(water) { dropf = 5; pl->timeinair = 0; }; // float slowly down in water if(pl->onladder) { dropf = 0; pl->timeinair = 0; }; - drop = dropf*curtime/gravity/100/moveres; // at high fps, gravity kicks in too fast - rise = speed/moveres/1.2f; // extra smoothness when lifting up stairs + drop = dropf*curtime/gravity/100/moveres; // at high fps, gravity kicks in too fast + rise = speed/moveres/1.2f; // extra smoothness when lifting up stairs }; - const float f = 1.0f/moveres; - - loopi(moveres) // discrete steps collision detection & sliding + if(!floating) loopi(moveres) // discrete steps collision detection & sliding { + const float f = 1.0f/moveres; + // try move forward pl->o.x += f*d.x; pl->o.y += f*d.y;