Player: Check Y-acceleration on jump

Doom2D · Jan 9, 2016 · 8aa52d7 · 8aa52d7
1 parent 307b0fc
commit 8aa52d7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/DF Sources/g_player.pas b/DF Sources/g_player.pas
@@ -2537,9 +2537,10 @@ procedure TPlayer.Jump();
     FCanJetpack := False;
 
 // Ïðûãàåì èëè âñïëûâàåì:
-  if CollideLevel(0, 1) or
-    g_Map_CollidePanel(FObj.X+PLAYER_RECT.X, FObj.Y+PLAYER_RECT.Y+36, PLAYER_RECT.Width,
-                       PLAYER_RECT.Height-33, PANEL_STEP, False) then
+  if (CollideLevel(0, 1) or
+      g_Map_CollidePanel(FObj.X+PLAYER_RECT.X, FObj.Y+PLAYER_RECT.Y+36, PLAYER_RECT.Width,
+                       PLAYER_RECT.Height-33, PANEL_STEP, False)
+     ) and (FObj.Accel.Y = 0) then // Íå ïðûãàòü, åñëè åñòü âåðòèêàëüíîå óñêîðåíèå
   begin
     FObj.Vel.Y := -VEL_JUMP;
     FCanJetpack := False;