Merge branch 'master' into Mario/weapons_new

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_new_toys.qc

diff --git a/qcsrc/server/mutators/mutator_new_toys.qc b/qcsrc/server/mutators/mutator_new_toys.qc
index d540adee6e23f4b4a98e79b1dbe6ea675fd25a50..5e9e0d7f6915bd7bb2845bf996fcaa3425b0782e 100644 (file)
--- a/qcsrc/server/mutators/mutator_new_toys.qc
+++ b/qcsrc/server/mutators/mutator_new_toys.qc
@@ -87,7 +87,7 @@ float nt_IsNewToy(float w)
                case WEP_MINE_LAYER:
                case WEP_HLAC:
                case WEP_RIFLE:
-               case WEP_SHOTGUN:
+               case WEP_SHOCKWAVE:
                        return TRUE;
                default:
                        return FALSE;
@@ -102,7 +102,7 @@ string nt_GetFullReplacement(string w)
                case "rocketlauncher": return "minelayer";
                case "uzi": return "hlac";
                case "vortex": return "rifle";
-               case "shockwave": return "shotgun";
+               case "shotgun": return "shockwave";
                default: return string_null;
        }
 }