From 2df5e2884e361ef76a22434615401db8ac41070d Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Wed, 6 Mar 2019 20:05:07 +0100
Subject: [PATCH] scihunt: fix weapon order

---
 Source/shared/scihunt/weapons.c |   8 ++++----
 Source/shared/scihunt/weapons.h |   8 ++++----
 scihunt/progs.dat               | Bin 214082 -> 214082 bytes
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/shared/scihunt/weapons.c b/Source/shared/scihunt/weapons.c
index e207275c..15cc667e 100644
--- a/Source/shared/scihunt/weapons.c
+++ b/Source/shared/scihunt/weapons.c
@@ -14,11 +14,14 @@ weapon_t w_null = {};
 weapon_t g_weapons[] = {
 	w_null,
 	w_crowbar,
+	w_hammer,
+	w_chainsaw,
 	w_glock,
 	w_python,
 	w_mp5,
 	w_shotgun,
 	w_crossbow,
+	w_cannon,
 	w_rpg,
 	w_gauss,
 	w_egon,
@@ -26,10 +29,7 @@ weapon_t g_weapons[] = {
 	w_handgrenade,
 	w_satchel,
 	w_tripmine,
-	w_snark,
-	w_cannon,
-	w_chainsaw,
-	w_hammer
+	w_snark
 };
 
 void Weapons_Init(void)
diff --git a/Source/shared/scihunt/weapons.h b/Source/shared/scihunt/weapons.h
index ad5eece7..866629ef 100644
--- a/Source/shared/scihunt/weapons.h
+++ b/Source/shared/scihunt/weapons.h
@@ -34,11 +34,14 @@ enum
 {
 	WEAPON_NONE,
 	WEAPON_CROWBAR,
+	WEAPON_HAMMER,
+	WEAPON_CHAINSAW,
 	WEAPON_GLOCK,
 	WEAPON_PYTHON,
 	WEAPON_MP5,
 	WEAPON_SHOTGUN,
 	WEAPON_CROSSBOW,
+	WEAPON_CANNON,
 	WEAPON_RPG,
 	WEAPON_GAUSS,
 	WEAPON_EGON,
@@ -46,10 +49,7 @@ enum
 	WEAPON_HANDGRENADE,
 	WEAPON_SATCHEL,
 	WEAPON_TRIPMINE,
-	WEAPON_SNARK,
-	WEAPON_CANNON,
-	WEAPON_CHAINSAW,
-	WEAPON_HAMMER
+	WEAPON_SNARK
 };
 
 /* What the weapons do support and stuff */
diff --git a/scihunt/progs.dat b/scihunt/progs.dat
index 46866acd57c25e7bf8a4703cc481d5a81cbd9d2f..4e372777f021ddfad408a9b7f5eefe7eb16823f6 100644
GIT binary patch
delta 242
zcmX@q!F#BKw_yuo&hhCf=NT2Y_Z(+TV4i;GIwRloTh|$dw)323j9_8%V4QAtg;8#M
z%X!8FEYsiIViedOa)q&jdHRzZi~`f&Txa|-z2qKH@XHOxAB@vg?gIt?++y6on6!QE
zZN}qF)8{+@n%8uXaS>zMcGdfg<&2CD)8{^5oX(grUG@Z{^!9*<j4q6fS=*;RV!Wv!
z=*F1Eu!+TpD;7$-Y_Df#Di@s2Cd#BS-At6pK@cL-$mIf7(a7c8o-fL@JztbLP-^-f
fV`i7>6+mM90e$8W#_1*?ridZ40@F4VW+wpv58GCp

delta 257
zcmX@q!F#BKw_yuo&T&C!Mg};@WZ1~!yuJ1~V?MK>3!1pg_P?hX(^;nH9A{M6-g2Jt
z01KnXcGoM6)0wBgImO5~{nd5GU(@egXB61}<p$#q#_29s7zL*Pxy87FF?Rdf+l<GV
zra!p>6luA~xM2F5TR>$d_Zc%78B?aueZV+<`kLE7BeYI1@@)@z$mqhzn6`cDBgUHw
zK-Xn4Y+^Cu%7D@i+v}N`$^|(g;*DG`)8C6Q=`+So7Z+u6Z!Z&N+FmBg>?O6`!+<%2
ear*;9W(B6{a}1eXrn49Ti39q~F566)odf_#AXY8_