X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=2f089d711a6bd6265a1a6284c36c4f12b04c7ce1;hb=9ecce49b43c44343c6061091189b48888520bdf1;hp=b8a77bd44fa2f02aab7ce19e624048a1a2533f2f;hpb=c8d7811d45c2d34a7e297613e50570f253a0d8e9;p=d2df-sdl.git

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index b8a77bd..2f089d7 100644
--- 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);
@@ -4368,6 +4368,7 @@ begin
   FMonsterKills := 0;
   FDeath := 0;
   FSecrets := 0;
+  FSpawnInvul := 0;
   FReady := False;
   if FNoRespawn then
   begin
@@ -4560,6 +4561,7 @@ begin
   FShellTimer := -1;
   FPain := 0;
   FLastHit := 0;
+  FSpawnInvul := 0;
 
   if not g_Game_IsServer then
     Exit;
@@ -6303,6 +6305,7 @@ begin
       if FMegaRulez[MR_INVUL] < gTime+PLAYER_INVUL_TIME then
       begin
         FMegaRulez[MR_INVUL] := gTime+PLAYER_INVUL_TIME;
+        FSpawnInvul := 0;
       end;
 
     ITEM_INVIS: