get rid of "kastet" and "pulemet" in symbols

diff --git a/lang/editor.ru_RU.lng b/lang/editor.ru_RU.lng
index 7d34049c2b9be111d18d14602e81005416b59c60..233cf74a2fedd343109a3d47fd0a833863253ece 100644 (file)
--- a/lang/editor.ru_RU.lng
+++ b/lang/editor.ru_RU.lng
@@ -125,8 +125,8 @@ g_language.MsgArrayItemPlasmaRifle$ = "Plasma Rifle"
 g_language.MsgArrayItemPlasmaRifle  = "Плазмопушка"
 g_language.MsgArrayItemBfg$ = "BFG9000"
 g_language.MsgArrayItemBfg  = "BFG9000"
 g_language.MsgArrayItemPlasmaRifle  = "Плазмопушка"
 g_language.MsgArrayItemBfg$ = "BFG9000"
 g_language.MsgArrayItemBfg  = "BFG9000"

-g_language.MsgArrayItemSuperMinigun$ = "Super Chaingun"
-g_language.MsgArrayItemSuperMinigun  = "Суперпулемёт"
+g_language.MsgArrayItemSuperChaingun$ = "Super Chaingun"
+g_language.MsgArrayItemSuperChaingun  = "Суперпулемёт"

 g_language.MsgArrayItemFlamethrower$ = "Flamethrower"
 g_language.MsgArrayItemFlamethrower  = "Огнемёт"
 g_language.MsgArrayItemClip$ = "Clip"
 g_language.MsgArrayItemFlamethrower$ = "Flamethrower"
 g_language.MsgArrayItemFlamethrower  = "Огнемёт"
 g_language.MsgArrayItemClip$ = "Clip"

diff --git a/src/editor/f_main.pas b/src/editor/f_main.pas
index e2fdc20540eb336e1dd0f611588044788c4149bf..d40610abd027e358c38bd3916a6ba3f53c979e57 100644 (file)
--- a/src/editor/f_main.pas
+++ b/src/editor/f_main.pas
@@ -3420,7 +3420,7 @@ begin
               else
                 begin
                   item.ItemType := lbItemList.ItemIndex + ITEM_MEDKIT_SMALL;
               else
                 begin
                   item.ItemType := lbItemList.ItemIndex + ITEM_MEDKIT_SMALL;

-                  if item.ItemType >= ITEM_WEAPON_KASTET then
+                  if item.ItemType >= ITEM_WEAPON_IRONFIST then

                     item.ItemType := item.ItemType + 2;
                   item.X := MousePos.X-MapOffset.X;
                   item.Y := MousePos.Y-MapOffset.Y;
                     item.ItemType := item.ItemType + 2;
                   item.X := MousePos.X-MapOffset.X;
                   item.Y := MousePos.Y-MapOffset.Y;


@@ -6239,7 +6239,7 @@ begin
       if ShowModal() = mrOK then
       begin
         b := lbTypeSelect.ItemIndex + ITEM_MEDKIT_SMALL;
       if ShowModal() = mrOK then
       begin
         b := lbTypeSelect.ItemIndex + ITEM_MEDKIT_SMALL;

-        if b >= ITEM_WEAPON_KASTET then
+        if b >= ITEM_WEAPON_IRONFIST then

           b := b + 2;
         Values[Key] := ItemToStr(b);
         vleObjectPropertyApply(Sender);
           b := b + 2;
         Values[Key] := ItemToStr(b);
         vleObjectPropertyApply(Sender);

diff --git a/src/editor/g_language.pas b/src/editor/g_language.pas
index f30ffea457fffb28d9a186efe2b3deb5030e0f67..7d4f2d83c869aca819ce76a250843520163f549d 100644 (file)
--- a/src/editor/g_language.pas
+++ b/src/editor/g_language.pas
@@ -59,7 +59,7 @@ Interface
     MsgArrayItemRocketLauncher = 'Rocket Launcher';
     MsgArrayItemPlasmaRifle = 'Plasma Rifle';
     MsgArrayItemBfg = 'BFG9000';
     MsgArrayItemRocketLauncher = 'Rocket Launcher';
     MsgArrayItemPlasmaRifle = 'Plasma Rifle';
     MsgArrayItemBfg = 'BFG9000';

-    MsgArrayItemSuperMinigun = 'Super Chaingun';
+    MsgArrayItemSuperChaingun = 'Super Chaingun';

     MsgArrayItemFlamethrower = 'Flamethrower';
     MsgArrayItemClip = 'Clip';
     MsgArrayItemAmmoBox = 'Box of Bullets';
     MsgArrayItemFlamethrower = 'Flamethrower';
     MsgArrayItemClip = 'Clip';
     MsgArrayItemAmmoBox = 'Box of Bullets';


@@ -731,7 +731,7 @@ begin
   ItemNames[ITEM_WEAPON_ROCKETLAUNCHER] := MsgArrayItemRocketLauncher;
   ItemNames[ITEM_WEAPON_PLASMA] := MsgArrayItemPlasmaRifle;
   ItemNames[ITEM_WEAPON_BFG] := MsgArrayItemBfg;
   ItemNames[ITEM_WEAPON_ROCKETLAUNCHER] := MsgArrayItemRocketLauncher;
   ItemNames[ITEM_WEAPON_PLASMA] := MsgArrayItemPlasmaRifle;
   ItemNames[ITEM_WEAPON_BFG] := MsgArrayItemBfg;

-  ItemNames[ITEM_WEAPON_SUPERPULEMET] := MsgArrayItemSuperMinigun;
+  ItemNames[ITEM_WEAPON_SUPERCHAINGUN] := MsgArrayItemSuperChaingun;

   ItemNames[ITEM_WEAPON_FLAMETHROWER] := MsgArrayItemFlamethrower;
   ItemNames[ITEM_AMMO_BULLETS] := MsgArrayItemClip;
   ItemNames[ITEM_AMMO_BULLETS_BOX] := MsgArrayItemAmmoBox;
   ItemNames[ITEM_WEAPON_FLAMETHROWER] := MsgArrayItemFlamethrower;
   ItemNames[ITEM_AMMO_BULLETS] := MsgArrayItemClip;
   ItemNames[ITEM_AMMO_BULLETS_BOX] := MsgArrayItemAmmoBox;


@@ -746,7 +746,7 @@ begin
   ItemNames[ITEM_KEY_RED] := MsgArrayItemKeyRed;
   ItemNames[ITEM_KEY_GREEN] := MsgArrayItemKeyGreen;
   ItemNames[ITEM_KEY_BLUE] := MsgArrayItemKeyBlue;
   ItemNames[ITEM_KEY_RED] := MsgArrayItemKeyRed;
   ItemNames[ITEM_KEY_GREEN] := MsgArrayItemKeyGreen;
   ItemNames[ITEM_KEY_BLUE] := MsgArrayItemKeyBlue;

-  ItemNames[ITEM_WEAPON_KASTET] := '?';
+  ItemNames[ITEM_WEAPON_IRONFIST] := '?';

   ItemNames[ITEM_WEAPON_PISTOL] := '??';
   ItemNames[ITEM_BOTTLE] := MsgArrayItemBottle;
   ItemNames[ITEM_HELMET] := MsgArrayItemHelmet;
   ItemNames[ITEM_WEAPON_PISTOL] := '??';
   ItemNames[ITEM_BOTTLE] := MsgArrayItemBottle;
   ItemNames[ITEM_HELMET] := MsgArrayItemHelmet;

diff --git a/src/editor/g_map.pas b/src/editor/g_map.pas
index 5b2cc5f54ce11899881a12d1d89592b90b20adfc..9901af6e635ad3e3419f2ba6fe3009ae6ee0cd02 100644 (file)
--- a/src/editor/g_map.pas
+++ b/src/editor/g_map.pas
@@ -113,7 +113,7 @@ const
      ((62), (16)), // WEAPON_ROCKETLAUNCHER
      ((54), (16)), // WEAPON_PLASMA
      ((61), (36)), // WEAPON_BFG
      ((62), (16)), // WEAPON_ROCKETLAUNCHER
      ((54), (16)), // WEAPON_PLASMA
      ((61), (36)), // WEAPON_BFG

-     ((54), (16)), // WEAPON_SUPERPULEMET
+     ((54), (16)), // WEAPON_SUPERCHAINGUN

      (( 9), (11)), // AMMO_BULLETS
      ((28), (16)), // AMMO_BULLETS_BOX
      ((15), ( 7)), // AMMO_SHELLS
      (( 9), (11)), // AMMO_BULLETS
      ((28), (16)), // AMMO_BULLETS_BOX
      ((15), ( 7)), // AMMO_SHELLS


@@ -126,7 +126,7 @@ const
      ((16), (16)), // KEY_RED
      ((16), (16)), // KEY_GREEN
      ((16), (16)), // KEY_BLUE
      ((16), (16)), // KEY_RED
      ((16), (16)), // KEY_GREEN
      ((16), (16)), // KEY_BLUE

-     (( 1), ( 1)), // WEAPON_KASTET
+     (( 1), ( 1)), // WEAPON_IRONFIST

      ((43), (16)), // WEAPON_PISTOL
      ((14), (18)), // BOTTLE
      ((16), (15)), // HELMET
      ((43), (16)), // WEAPON_PISTOL
      ((14), (18)), // BOTTLE
      ((16), (15)), // HELMET


@@ -262,7 +262,7 @@ const
   OLD_ITEM_WEAPON_ROCKETLAUNCHER = 11;
   OLD_ITEM_WEAPON_PLASMA         = 12;
   OLD_ITEM_WEAPON_BFG            = 13;
   OLD_ITEM_WEAPON_ROCKETLAUNCHER = 11;
   OLD_ITEM_WEAPON_PLASMA         = 12;
   OLD_ITEM_WEAPON_BFG            = 13;

-  OLD_ITEM_WEAPON_SUPERPULEMET   = 14;
+  OLD_ITEM_WEAPON_SUPERCHAINGUN  = 14;

   OLD_ITEM_AMMO_BULLETS          = 15;
   OLD_ITEM_AMMO_BULLETS_BOX      = 16;
   OLD_ITEM_AMMO_SHELLS           = 17;
   OLD_ITEM_AMMO_BULLETS          = 15;
   OLD_ITEM_AMMO_BULLETS_BOX      = 16;
   OLD_ITEM_AMMO_SHELLS           = 17;


@@ -294,7 +294,7 @@ const
                  (ITEM_WEAPON_ROCKETLAUNCHER),
                  (ITEM_WEAPON_PLASMA),
                  (ITEM_WEAPON_BFG),
                  (ITEM_WEAPON_ROCKETLAUNCHER),
                  (ITEM_WEAPON_PLASMA),
                  (ITEM_WEAPON_BFG),

-                 (ITEM_WEAPON_SUPERPULEMET),
+                 (ITEM_WEAPON_SUPERCHAINGUN),

                  (ITEM_AMMO_BULLETS),
                  (ITEM_AMMO_BULLETS_BOX),
                  (ITEM_AMMO_SHELLS),
                  (ITEM_AMMO_BULLETS),
                  (ITEM_AMMO_BULLETS_BOX),
                  (ITEM_AMMO_SHELLS),


@@ -330,7 +330,7 @@ const
      ((61), (15)), // WEAPON_ROCKETLAUNCHER
      ((53), (14)), // WEAPON_PLASMA
      ((61), (34)), // WEAPON_BFG
      ((61), (15)), // WEAPON_ROCKETLAUNCHER
      ((53), (14)), // WEAPON_PLASMA
      ((61), (34)), // WEAPON_BFG

-     ((53), (16)), // WEAPON_SUPERPULEMET
+     ((53), (16)), // WEAPON_SUPERCHAINGUN

      (( 9), (10)), // AMMO_BULLETS
      ((28), (16)), // AMMO_BULLETS_BOX
      ((15), ( 7)), // AMMO_SHELLS
      (( 9), (10)), // AMMO_BULLETS
      ((28), (16)), // AMMO_BULLETS_BOX
      ((15), ( 7)), // AMMO_SHELLS


@@ -2221,7 +2221,7 @@ begin
             ITEM_WEAPON_ROCKETLAUNCHER: g_GetTexture('ITEM_WEAPON_ROCKETLAUNCHER', ID);
             ITEM_WEAPON_PLASMA: g_GetTexture('ITEM_WEAPON_PLASMA', ID);
             ITEM_WEAPON_BFG: g_GetTexture('ITEM_WEAPON_BFG', ID);
             ITEM_WEAPON_ROCKETLAUNCHER: g_GetTexture('ITEM_WEAPON_ROCKETLAUNCHER', ID);
             ITEM_WEAPON_PLASMA: g_GetTexture('ITEM_WEAPON_PLASMA', ID);
             ITEM_WEAPON_BFG: g_GetTexture('ITEM_WEAPON_BFG', ID);

-            ITEM_WEAPON_SUPERPULEMET: g_GetTexture('ITEM_WEAPON_SUPERPULEMET', ID);
+            ITEM_WEAPON_SUPERCHAINGUN: g_GetTexture('ITEM_WEAPON_SUPERCHAINGUN', ID);

             ITEM_AMMO_BULLETS: g_GetTexture('ITEM_AMMO_BULLETS', ID);
             ITEM_AMMO_BULLETS_BOX: g_GetTexture('ITEM_AMMO_BULLETS_BOX', ID);
             ITEM_AMMO_SHELLS: g_GetTexture('ITEM_AMMO_SHELLS', ID);
             ITEM_AMMO_BULLETS: g_GetTexture('ITEM_AMMO_BULLETS', ID);
             ITEM_AMMO_BULLETS_BOX: g_GetTexture('ITEM_AMMO_BULLETS_BOX', ID);
             ITEM_AMMO_SHELLS: g_GetTexture('ITEM_AMMO_SHELLS', ID);


@@ -2615,7 +2615,7 @@ begin
                         ITEM_WEAPON_ROCKETLAUNCHER: g_GetTexture('ITEM_WEAPON_ROCKETLAUNCHER', ID);
                         ITEM_WEAPON_PLASMA: g_GetTexture('ITEM_WEAPON_PLASMA', ID);
                         ITEM_WEAPON_BFG: g_GetTexture('ITEM_WEAPON_BFG', ID);
                         ITEM_WEAPON_ROCKETLAUNCHER: g_GetTexture('ITEM_WEAPON_ROCKETLAUNCHER', ID);
                         ITEM_WEAPON_PLASMA: g_GetTexture('ITEM_WEAPON_PLASMA', ID);
                         ITEM_WEAPON_BFG: g_GetTexture('ITEM_WEAPON_BFG', ID);

-                        ITEM_WEAPON_SUPERPULEMET: g_GetTexture('ITEM_WEAPON_SUPERPULEMET', ID);
+                        ITEM_WEAPON_SUPERCHAINGUN: g_GetTexture('ITEM_WEAPON_SUPERCHAINGUN', ID);

                         ITEM_AMMO_BULLETS: g_GetTexture('ITEM_AMMO_BULLETS', ID);
                         ITEM_AMMO_BULLETS_BOX: g_GetTexture('ITEM_AMMO_BULLETS_BOX', ID);
                         ITEM_AMMO_SHELLS: g_GetTexture('ITEM_AMMO_SHELLS', ID);
                         ITEM_AMMO_BULLETS: g_GetTexture('ITEM_AMMO_BULLETS', ID);
                         ITEM_AMMO_BULLETS_BOX: g_GetTexture('ITEM_AMMO_BULLETS_BOX', ID);
                         ITEM_AMMO_SHELLS: g_GetTexture('ITEM_AMMO_SHELLS', ID);


@@ -2913,14 +2913,14 @@ begin
  g_CreateTextureWAD('ITEM_MEDKIT_LARGE', GameWad + ':TEXTURES\MED2');
  g_CreateTextureWAD('ITEM_WEAPON_SAW', GameWad + ':TEXTURES\SAW');
  g_CreateTextureWAD('ITEM_WEAPON_PISTOL', GameWad + ':TEXTURES\PISTOL');
  g_CreateTextureWAD('ITEM_MEDKIT_LARGE', GameWad + ':TEXTURES\MED2');
  g_CreateTextureWAD('ITEM_WEAPON_SAW', GameWad + ':TEXTURES\SAW');
  g_CreateTextureWAD('ITEM_WEAPON_PISTOL', GameWad + ':TEXTURES\PISTOL');

- g_CreateTextureWAD('ITEM_WEAPON_KASTET', GameWad + ':TEXTURES\KASTET');
+ g_CreateTextureWAD('ITEM_WEAPON_IRONFIST', GameWad + ':TEXTURES\IRONFIST');

  g_CreateTextureWAD('ITEM_WEAPON_SHOTGUN1', GameWad + ':TEXTURES\SHOTGUN1');
  g_CreateTextureWAD('ITEM_WEAPON_SHOTGUN2', GameWad + ':TEXTURES\SHOTGUN2');
  g_CreateTextureWAD('ITEM_WEAPON_CHAINGUN', GameWad + ':TEXTURES\MGUN');
  g_CreateTextureWAD('ITEM_WEAPON_ROCKETLAUNCHER', GameWad + ':TEXTURES\RLAUNCHER');
  g_CreateTextureWAD('ITEM_WEAPON_PLASMA', GameWad + ':TEXTURES\PGUN');
  g_CreateTextureWAD('ITEM_WEAPON_BFG', GameWad + ':TEXTURES\BFG');
  g_CreateTextureWAD('ITEM_WEAPON_SHOTGUN1', GameWad + ':TEXTURES\SHOTGUN1');
  g_CreateTextureWAD('ITEM_WEAPON_SHOTGUN2', GameWad + ':TEXTURES\SHOTGUN2');
  g_CreateTextureWAD('ITEM_WEAPON_CHAINGUN', GameWad + ':TEXTURES\MGUN');
  g_CreateTextureWAD('ITEM_WEAPON_ROCKETLAUNCHER', GameWad + ':TEXTURES\RLAUNCHER');
  g_CreateTextureWAD('ITEM_WEAPON_PLASMA', GameWad + ':TEXTURES\PGUN');
  g_CreateTextureWAD('ITEM_WEAPON_BFG', GameWad + ':TEXTURES\BFG');

- g_CreateTextureWAD('ITEM_WEAPON_SUPERPULEMET', GameWad + ':TEXTURES\SPULEMET');
+ g_CreateTextureWAD('ITEM_WEAPON_SUPERCHAINGUN', GameWad + ':TEXTURES\SCHAINGUN');

  g_CreateTextureWAD('ITEM_AMMO_BULLETS', GameWad + ':TEXTURES\CLIP');
  g_CreateTextureWAD('ITEM_AMMO_BULLETS_BOX', GameWad + ':TEXTURES\AMMO');
  g_CreateTextureWAD('ITEM_AMMO_SHELLS', GameWad + ':TEXTURES\SHELL1');
  g_CreateTextureWAD('ITEM_AMMO_BULLETS', GameWad + ':TEXTURES\CLIP');
  g_CreateTextureWAD('ITEM_AMMO_BULLETS_BOX', GameWad + ':TEXTURES\AMMO');
  g_CreateTextureWAD('ITEM_AMMO_SHELLS', GameWad + ':TEXTURES\SHELL1');


@@ -2992,14 +2992,14 @@ begin
  g_DeleteTexture('ITEM_MEDKIT_LARGE');
  g_DeleteTexture('ITEM_WEAPON_SAW');
  g_DeleteTexture('ITEM_WEAPON_PISTOL');
  g_DeleteTexture('ITEM_MEDKIT_LARGE');
  g_DeleteTexture('ITEM_WEAPON_SAW');
  g_DeleteTexture('ITEM_WEAPON_PISTOL');

- g_DeleteTexture('ITEM_WEAPON_KASTET');
+ g_DeleteTexture('ITEM_WEAPON_IRONFIST');

  g_DeleteTexture('ITEM_WEAPON_SHOTGUN1');
  g_DeleteTexture('ITEM_WEAPON_SHOTGUN2');
  g_DeleteTexture('ITEM_WEAPON_CHAINGUN');
  g_DeleteTexture('ITEM_WEAPON_ROCKETLAUNCHER');
  g_DeleteTexture('ITEM_WEAPON_PLASMA');
  g_DeleteTexture('ITEM_WEAPON_BFG');
  g_DeleteTexture('ITEM_WEAPON_SHOTGUN1');
  g_DeleteTexture('ITEM_WEAPON_SHOTGUN2');
  g_DeleteTexture('ITEM_WEAPON_CHAINGUN');
  g_DeleteTexture('ITEM_WEAPON_ROCKETLAUNCHER');
  g_DeleteTexture('ITEM_WEAPON_PLASMA');
  g_DeleteTexture('ITEM_WEAPON_BFG');

- g_DeleteTexture('ITEM_WEAPON_SUPERPULEMET');
+ g_DeleteTexture('ITEM_WEAPON_SUPERCHAINGUN');

  g_DeleteTexture('ITEM_AMMO_BULLETS');
  g_DeleteTexture('ITEM_AMMO_BULLETS_BOX');
  g_DeleteTexture('ITEM_AMMO_SHELLS');
  g_DeleteTexture('ITEM_AMMO_BULLETS');
  g_DeleteTexture('ITEM_AMMO_BULLETS_BOX');
  g_DeleteTexture('ITEM_AMMO_SHELLS');

diff --git a/src/shared/MAPDEF.pas b/src/shared/MAPDEF.pas
index b39b5fabb3ba64de636e9564036d96d1dc8c5736..232578b48683a9428a4044e24d7959f376e12c57 100644 (file)
--- a/src/shared/MAPDEF.pas
+++ b/src/shared/MAPDEF.pas
@@ -59,7 +59,7 @@ const
   ITEM_WEAPON_ROCKETLAUNCHER = 15;
   ITEM_WEAPON_PLASMA         = 16;
   ITEM_WEAPON_BFG            = 17;
   ITEM_WEAPON_ROCKETLAUNCHER = 15;
   ITEM_WEAPON_PLASMA         = 16;
   ITEM_WEAPON_BFG            = 17;

-  ITEM_WEAPON_SUPERPULEMET   = 18;
+  ITEM_WEAPON_SUPERCHAINGUN  = 18;

   ITEM_AMMO_BULLETS          = 19;
   ITEM_AMMO_BULLETS_BOX      = 20;
   ITEM_AMMO_SHELLS           = 21;
   ITEM_AMMO_BULLETS          = 19;
   ITEM_AMMO_BULLETS_BOX      = 20;
   ITEM_AMMO_SHELLS           = 21;


@@ -72,7 +72,7 @@ const
   ITEM_KEY_RED               = 28;
   ITEM_KEY_GREEN             = 29;
   ITEM_KEY_BLUE              = 30;
   ITEM_KEY_RED               = 28;
   ITEM_KEY_GREEN             = 29;
   ITEM_KEY_BLUE              = 30;

-  ITEM_WEAPON_KASTET         = 31;
+  ITEM_WEAPON_IRONFIST       = 31;

   ITEM_WEAPON_PISTOL         = 32;
   ITEM_BOTTLE                = 33;
   ITEM_HELMET                = 34;
   ITEM_WEAPON_PISTOL         = 32;
   ITEM_BOTTLE                = 33;
   ITEM_HELMET                = 34;