oops; don't drop keys when dmkeys is 1

[d2df-sdl.git] / src / game / g_player.pas

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index b8a77bd44fa2f02aab7ce19e624048a1a2533f2f..2ec93df11d2f99501fa7ce1176c5076105436ad7 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -3542,7 +3542,7 @@ begin
 
 // Âûáðîñ êëþ÷åé:
     if (not (gGameSettings.GameMode in [GM_DM, GM_TDM, GM_CTF])) or
-       LongBool(gGameSettings.Options and GAME_OPTION_DMKEYS) then
+       (not LongBool(gGameSettings.Options and GAME_OPTION_DMKEYS)) then
     begin
       if R_KEY_RED in FRulez then
         PushItem(ITEM_KEY_RED);
@@ -4827,7 +4827,7 @@ begin
 
   if FDirection = TDirection.D_LEFT then FAngle := ANGLE_LEFTDOWN else FAngle := ANGLE_RIGHTDOWN;
 
-  if FIncCam > -120 then DecMin(FIncCam, 5, -120);
+  if FIncCam > -120.0 * g_dbg_scale then DecMin(FIncCam, 5, Integer(-120.0 * g_dbg_scale));
 end;
 
 procedure TPlayer.SeeUp();
@@ -4836,7 +4836,7 @@ begin
 
   if FDirection = TDirection.D_LEFT then FAngle := ANGLE_LEFTUP else FAngle := ANGLE_RIGHTUP;
 
-  if FIncCam < 120 then IncMax(FIncCam, 5, 120);
+  if FIncCam < 120.0 * g_dbg_scale then IncMax(FIncCam, 5, Integer(120.0 * g_dbg_scale));
 end;
 
 procedure TPlayer.SetAction(Action: Byte; Force: Boolean = False);