X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_weapons.pas;h=9b0952edbb1652aa1a28ca09fb948d5a23527471;hb=HEAD;hp=f0fe29114071a4c6b9f5ce2f9b64ec678d387e77;hpb=6c45ab8eddd0887ecaa11ad3ed284dbdd3a3730c;p=d2df-sdl.git

diff --git a/src/game/g_weapons.pas b/src/game/g_weapons.pas
index f0fe291..9b0952e 100644
--- a/src/game/g_weapons.pas
+++ b/src/game/g_weapons.pas
@@ -84,7 +84,7 @@ procedure g_Weapon_LoadState (st: TStream);
 procedure g_Weapon_AddDynLights();
 
 const
-  WEAPON_KASTET         = 0;
+  WEAPON_IRONFIST       = 0;
   WEAPON_SAW            = 1;
   WEAPON_PISTOL         = 2;
   WEAPON_SHOTGUN1       = 3;
@@ -93,7 +93,7 @@ const
   WEAPON_ROCKETLAUNCHER = 6;
   WEAPON_PLASMA         = 7;
   WEAPON_BFG            = 8;
-  WEAPON_SUPERPULEMET   = 9;
+  WEAPON_SUPERCHAINGUN  = 9;
   WEAPON_FLAMETHROWER   = 10;
   WEAPON_ZOMBY_PISTOL   = 20;
   WEAPON_IMP_FIRE       = 21;
@@ -103,7 +103,7 @@ const
   WEAPON_MANCUB_FIRE    = 25;
   WEAPON_SKEL_FIRE      = 26;
 
-  WP_FIRST          = WEAPON_KASTET;
+  WP_FIRST          = WEAPON_IRONFIST;
   WP_LAST           = WEAPON_FLAMETHROWER;
 
 
@@ -896,7 +896,7 @@ begin
       // È â êîíöå èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî
       // (èëè ñíàðÿä îò ìîíñòðà, èëè friendlyfire, èëè friendly_hit_projectile)
       if (g_GetUIDType(SpawnerUID) <> UID_PLAYER) or
-         LongBool(gGameSettings.Options and (GAME_OPTION_TEAMDAMAGE or GAME_OPTION_TEAMHITPROJECTILE)) then
+         ([TGameOption.TEAM_DAMAGE, TGameOption.TEAM_HIT_PROJECTILE] <= gGameSettings.Options) then
       begin
         if PlayerHit() then
         begin
@@ -942,7 +942,7 @@ begin
 
       // È â êîíöå ñâîèõ èãðîêîâ, íî òîëüêî åñëè ïîëîæåíî
       // (èëè friendlyfire, èëè friendly_hit_projectile)
-      if LongBool(gGameSettings.Options and (GAME_OPTION_TEAMDAMAGE or GAME_OPTION_TEAMHITPROJECTILE)) then
+      if [TGameOption.TEAM_DAMAGE, TGameOption.TEAM_HIT_PROJECTILE] <= gGameSettings.Options then
       begin
         if PlayerHit(1) then
         begin
@@ -1414,10 +1414,10 @@ var
     if (gPlayers[idx] = nil) or not gPlayers[idx].alive then exit;
     if (spawnerPlr <> nil) then
     begin
-      if ((gGameSettings.Options and (GAME_OPTION_TEAMHITTRACE or GAME_OPTION_TEAMDAMAGE)) = 0) and
+      if (not ([TGameOption.TEAM_HIT_TRACE, TGameOption.TEAM_DAMAGE] <= gGameSettings.Options)) and
          (spawnerPlr.Team <> TEAM_NONE) and (spawnerPlr.Team = gPlayers[idx].Team) then
       begin
-        if (spawnerPlr <> gPlayers[idx]) and ((gGameSettings.Options and GAME_OPTION_TEAMABSORBDAMAGE) = 0) then
+        if (spawnerPlr <> gPlayers[idx]) and not (TGameOption.TEAM_ABSORB_DAMAGE in gGameSettings.Options) then
           dmg := Max(1, dmg div 2);
         exit;
       end;
@@ -2278,10 +2278,7 @@ begin
           // Â âîäå øëåéô - ïóçûðè, â âîçäóõå øëåéô - äûì:
             if WordBool(st and MOVE_INWATER) then
             begin
-              g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16);
-              if Random(2) = 0
-                then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', cx, cy)
-                else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', cx, cy);
+              g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16);
             end
             else if g_Frames_Get(_id, 'FRAMES_SMOKE') then
             begin
@@ -2413,12 +2410,8 @@ begin
                 end;
               end
               else
-              begin
-                g_GFX_Bubbles(cx, cy, 1+Random(3), 16, 16);
-                if Random(2) = 0
-                  then g_Sound_PlayExAt('SOUND_GAME_BUBBLE1', cx, cy)
-                  else g_Sound_PlayExAt('SOUND_GAME_BUBBLE2', cx, cy);
-              end;
+                g_Game_Effect_Bubbles(cx, cy, 1+Random(3), 16, 16);
+
               ShotType := 0;
               Continue;
             end;