pickup and armour fixes

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@34 e016b1c5-ed68-44aa-a2f7-31cac88cffde
2005-08-23 16:02:53 +00:00
parent 407befc0f3
commit 50ed00160b
10 changed files with 152 additions and 76 deletions
@@ -251,7 +251,10 @@ void moveplayer(dynent *pl, int moveres, bool local, int curtime)
            if(pl->jumpnext)
            {
                pl->jumpnext = false;
-                pl->vel.z = 1.7f;       // physics impulse upwards
+                if (pl->armour>0)␍
+                  pl->vel.z = 1.9f;
+                else
+                  pl->vel.z = 1.7f;       // physics impulse upwards
                if(water) { pl->vel.x /= 8; pl->vel.y /= 8; };      // dampen velocity change even harder, gives correct water feel
                if(local) playsoundc(S_JUMP);
                else if(pl->monsterstate) playsound(S_JUMP, &pl->o);