Merge branch 'master' into Mario/overkill

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapons.qc

diff --git a/qcsrc/common/weapons/weapons.qc b/qcsrc/common/weapons/weapons.qc
index b5aedfd1814779c88e8f8cb8a50c11e3dfc32f13..e45a901c3c62a2e13e3344a669d908c0bd8e507d 100644 (file)
--- a/qcsrc/common/weapons/weapons.qc
+++ b/qcsrc/common/weapons/weapons.qc
@@ -173,6 +173,20 @@ string W_NameWeaponOrder_MapFunc(string s)
        }
        return s;
 }
+
+string W_UndeprecateName(string s)
+{
+       switch ( s )
+       {
+               case "nex"            : return "vortex";
+               case "rocketlauncher" : return "devastator"; 
+               case "laser"          : return "blaster";
+               case "minstanex"      : return "vaporizer";
+               case "grenadelauncher": return "mortar";
+               case "uzi"            : return "machinegun";
+               default               : return s;
+       }
+}
 string W_NameWeaponOrder(string order)
 {
        return mapPriorityList(order, W_NameWeaponOrder_MapFunc);
@@ -182,6 +196,7 @@ string W_NumberWeaponOrder_MapFunc(string s)
        float i;
        if(s == "0" || stof(s))
                return s;
+       s = W_UndeprecateName(s);
        for(i = WEP_FIRST; i <= WEP_LAST; ++i)
                if(s == get_weaponinfo(i).netname)
                        return ftos(i);
@@ -269,6 +284,7 @@ string GetAmmoPicture(.float ammotype)
                case ammo_nails:   return "ammo_bullets";
                case ammo_rockets: return "ammo_rockets";
                case ammo_cells:   return "ammo_cells";
+               case ammo_plasma:  return "ammo_cells";
                case ammo_fuel:    return "ammo_fuel";
                default: return ""; // wtf, no ammo type?
        }
@@ -283,7 +299,8 @@ string GetAmmoPicture(.float ammotype)
                case 1: return ammo_nails;
                case 2: return ammo_rockets;
                case 3: return ammo_cells;
-               case 4: return ammo_fuel;
+               case 4: return ammo_plasma;
+               case 5: return ammo_fuel;
                default: return ammo_none;
        }
 }
@@ -296,6 +313,7 @@ float GetAmmoStat(.float ammotype)
                case ammo_nails: return STAT_NAILS;
                case ammo_rockets: return STAT_ROCKETS;
                case ammo_cells: return STAT_CELLS;
+               case ammo_plasma: return STAT_PLASMA;
                case ammo_fuel: return STAT_FUEL;
                default: return -1;
        }