From c1c78fa5f17f0b3ce3440a8e6ef8a6c8af2555a5 Mon Sep 17 00:00:00 2001 From: driAn Date: Tue, 16 Oct 2007 20:54:44 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1369 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/physics.cpp | 6 +++++- source/src/sound.cpp | 3 +-- source/vcpp/cube.suo | Bin 228352 -> 222720 bytes 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/src/physics.cpp b/source/src/physics.cpp index cea6972c..196951d4 100644 --- a/source/src/physics.cpp +++ b/source/src/physics.cpp @@ -268,8 +268,9 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime) } else // fake physics for player ents to create _the_ cube movement (tm) { + const int timeinair = pl->timeinair; int move = pl->onladder && !pl->onfloor && pl->move == -1 ? 0 : pl->move; // movement on ladder - + d.x = (float)(move*cosf(RAD*(pl->yaw-90))); d.y = (float)(move*sinf(RAD*(pl->yaw-90))); d.z = 0.0f; @@ -328,6 +329,9 @@ void moveplayer(physent *pl, int moveres, bool local, int curtime) pl->timeinair += curtime; } } + + // long jump + if(timeinair > 600 && !pl->timeinair) if(local) playsoundc(S_LAND); else playsound(S_LAND, pl); } const float gravity = 20.0f; diff --git a/source/src/sound.cpp b/source/src/sound.cpp index 842b62f2..d3b862b0 100644 --- a/source/src/sound.cpp +++ b/source/src/sound.cpp @@ -262,7 +262,6 @@ void checkmapsounds() } VAR(footsteps, 0, 1, 1); -VAR(footstepradius, 0, 16, 25); VAR(footstepalign, 5, 15, 4000); int findsoundloc(int sound, physent *p) @@ -278,7 +277,7 @@ void checkplayerloopsounds() playerent *p = players[i]; if(!p) continue; - if(footsteps && camera1->o.dist(p->o) < footstepradius) + if(footsteps && camera1->o.dist(p->o) < 16) { int idx = findsoundloc(S_FOOTSTEPS, p); if(idx == -1 || !soundlocs[idx].inuse) diff --git a/source/vcpp/cube.suo b/source/vcpp/cube.suo index 58a6b99e300bd4349a0078a14439db618fc8e1c0..e764b1255580e4eced16c104c1209354e5ec7154 100644 GIT binary patch delta 4557 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 b14+}DfM}A&yTJcyVmE261wF~%ud)9HaFg>^ delta 9216 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 T=DAQNY!q+i;D$r