more stuff

Doom2D · May 17, 2015 · bdc21dd · bdc21dd
1 parent 4ea9b01
commit bdc21dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DF Sources/g_player.pas b/DF Sources/g_player.pas
@@ -1942,7 +1942,7 @@ procedure TPlayer.Jump();
   if gFly or FJetpack then
   begin
     // Ïîëåò (÷èò-êîä èëè äæåòïàê):
-    FObj.Vel.Y := -VEL_FLY;
+    if FObj.Vel.Y > -VEL_FLY then FObj.Vel.Y := FObj.Vel.Y - 2;
     if FJetpack then
     begin
       if FMegaRulez[MR_JET] > 0 then Dec(FMegaRulez[MR_JET]);

diff --git a/DF Sources/g_weapons.pas b/DF Sources/g_weapons.pas
@@ -495,10 +495,10 @@ procedure throw(i, x, y, xd, yd, s: Integer);
   Shots[i].Obj.Vel.Y := (yd*s) div a;
   Shots[i].Obj.Accel.X := 0;
   Shots[i].Obj.Accel.Y := 0;
-  if Shots[i].ShotType in [WEAPON_BSP_FIRE, WEAPON_PLASMA] then
-    Shots[i].Timeout := 550 // ~15 sec
-  else
+  if Shots[i].ShotType in [WEAPON_ROCKETLAUNCHER, WEAPON_BFG] then
     Shots[i].Timeout := 900 // ~25 sec
+  else
+    Shots[i].Timeout := 550 // ~15 sec
 end;
 
 function g_Weapon_Hit(obj: PObj; d: Integer; SpawnerUID: Word; t: Byte): Byte;