From f802eeb7f635fbd4ab86cdae9ae1295f3350b9a7 Mon Sep 17 00:00:00 2001
From: Samual Lenks <samual@xonotic.org>
Date: Mon, 10 Jun 2013 17:53:20 -0400
Subject: [PATCH] Being renaming weapons

---
 qcsrc/common/weapons/{lightning.qc => arc.qc}    |  0
 qcsrc/common/weapons/{lightning.qh => arc.qh}    |  0
 qcsrc/common/weapons/{laser.qc => blaster.qc}    |  0
 .../weapons/{rocketlauncher.qc => devastator.qc} |  0
 qcsrc/common/weapons/{uzi.qc => machinegun.qc}   |  0
 .../weapons/{grenadelauncher.qc => mortar.qc}    |  0
 .../common/weapons/{shotgun.qc => shockwave.qc}  |  0
 qcsrc/common/weapons/weapons.qh                  | 16 ++++++++++------
 8 files changed, 10 insertions(+), 6 deletions(-)
 rename qcsrc/common/weapons/{lightning.qc => arc.qc} (100%)
 rename qcsrc/common/weapons/{lightning.qh => arc.qh} (100%)
 rename qcsrc/common/weapons/{laser.qc => blaster.qc} (100%)
 rename qcsrc/common/weapons/{rocketlauncher.qc => devastator.qc} (100%)
 rename qcsrc/common/weapons/{uzi.qc => machinegun.qc} (100%)
 rename qcsrc/common/weapons/{grenadelauncher.qc => mortar.qc} (100%)
 rename qcsrc/common/weapons/{shotgun.qc => shockwave.qc} (100%)

diff --git a/qcsrc/common/weapons/lightning.qc b/qcsrc/common/weapons/arc.qc
similarity index 100%
rename from qcsrc/common/weapons/lightning.qc
rename to qcsrc/common/weapons/arc.qc
diff --git a/qcsrc/common/weapons/lightning.qh b/qcsrc/common/weapons/arc.qh
similarity index 100%
rename from qcsrc/common/weapons/lightning.qh
rename to qcsrc/common/weapons/arc.qh
diff --git a/qcsrc/common/weapons/laser.qc b/qcsrc/common/weapons/blaster.qc
similarity index 100%
rename from qcsrc/common/weapons/laser.qc
rename to qcsrc/common/weapons/blaster.qc
diff --git a/qcsrc/common/weapons/rocketlauncher.qc b/qcsrc/common/weapons/devastator.qc
similarity index 100%
rename from qcsrc/common/weapons/rocketlauncher.qc
rename to qcsrc/common/weapons/devastator.qc
diff --git a/qcsrc/common/weapons/uzi.qc b/qcsrc/common/weapons/machinegun.qc
similarity index 100%
rename from qcsrc/common/weapons/uzi.qc
rename to qcsrc/common/weapons/machinegun.qc
diff --git a/qcsrc/common/weapons/grenadelauncher.qc b/qcsrc/common/weapons/mortar.qc
similarity index 100%
rename from qcsrc/common/weapons/grenadelauncher.qc
rename to qcsrc/common/weapons/mortar.qc
diff --git a/qcsrc/common/weapons/shotgun.qc b/qcsrc/common/weapons/shockwave.qc
similarity index 100%
rename from qcsrc/common/weapons/shotgun.qc
rename to qcsrc/common/weapons/shockwave.qc
diff --git a/qcsrc/common/weapons/weapons.qh b/qcsrc/common/weapons/weapons.qh
index bd698b0075..beaebaf55c 100644
--- a/qcsrc/common/weapons/weapons.qh
+++ b/qcsrc/common/weapons/weapons.qh
@@ -1,17 +1,19 @@
 // ONLY EVER ADD NEW WEAPONS AT THE END. IF YOU REMOVE ONE, PUT THE LAST ONE ON
 // ITS PLACE. THIS IS TO AVOID UNNECESSARY RENUMBERING OF WEAPON IMPULSES.
 // IF YOU DISREGARD THIS NOTICE, I'LL KILL YOU WITH THE @!#%'N TUBA
-#include "laser.qc"
-#include "shotgun.qc"
-#include "uzi.qc"
-#include "grenadelauncher.qc"
+
+// core weapons
+#include "blaster.qc"
+#include "shockwave.qc"
+#include "machinegun.qc"
+#include "mortar.qc"
 #include "minelayer.qc"
 #include "electro.qc"
-#include "lightning.qc"
+#include "arc.qc"
 #include "crylink.qc"
 #include "nex.qc"
 #include "hagar.qc"
-#include "rocketlauncher.qc"
+#include "devastator.qc"
 #include "porto.qc"
 #include "minstanex.qc"
 #include "hook.qc"
@@ -20,3 +22,5 @@
 #include "rifle.qc"
 #include "fireball.qc"
 #include "seeker.qc"
+
+// other weapons
-- 
2.39.5