From a0b1c7fb4d4041f4c6ee1ec4ef2984316ab11548 Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Wed, 31 Oct 2001 00:00:08 +0000 Subject: [PATCH] Changed the order of the weapons. --- reaction/ui/ui_controls2.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/reaction/ui/ui_controls2.c b/reaction/ui/ui_controls2.c index 522b38d8..9c998d49 100644 --- a/reaction/ui/ui_controls2.c +++ b/reaction/ui/ui_controls2.c @@ -268,15 +268,16 @@ static bind_t g_bindings[] = {"centerview", "center view", ID_CENTERVIEW, ANIM_IDLE, K_END, -1, -1, -1}, {"+zoom", "zoom view", ID_ZOOMVIEW, ANIM_IDLE, -1, -1, -1, -1}, //Blaze: Reaction Weapon binds - {"weapon 1", "Knife", ID_WEAPON1, ANIM_WEAPON1, '1', -1, -1, -1}, - {"weapon 2", "MK23", ID_WEAPON2, ANIM_WEAPON2, '2', -1, -1, -1}, - {"weapon 3", "M4", ID_WEAPON3, ANIM_WEAPON3, '3', -1, -1, -1}, - {"weapon 4", "SSG3000", ID_WEAPON4, ANIM_WEAPON4, '4', -1, -1, -1}, - {"weapon 5", "MP5", ID_WEAPON5, ANIM_WEAPON5, '5', -1, -1, -1}, - {"weapon 6", "Hand Cannon", ID_WEAPON6, ANIM_WEAPON6, '6', -1, -1, -1}, - {"weapon 7", "Shotgun", ID_WEAPON7, ANIM_WEAPON7, '7', -1, -1, -1}, - {"weapon 8", "Akimbo Pistols", ID_WEAPON8, ANIM_WEAPON8, '8', -1, -1, -1}, - {"weapon 9", "Grenade", ID_WEAPON9, ANIM_WEAPON9, '9', -1, -1, -1}, +//Jbravo: order is important. + {"weapon 1", "MK23", ID_WEAPON2, ANIM_WEAPON2, '2', -1, -1, -1}, + {"weapon 2", "Shotgun", ID_WEAPON7, ANIM_WEAPON7, '7', -1, -1, -1}, + {"weapon 3", "MP5", ID_WEAPON5, ANIM_WEAPON5, '5', -1, -1, -1}, + {"weapon 4", "Hand Cannon", ID_WEAPON6, ANIM_WEAPON6, '6', -1, -1, -1}, + {"weapon 5", "SSG3000", ID_WEAPON4, ANIM_WEAPON4, '4', -1, -1, -1}, + {"weapon 6", "M4", ID_WEAPON3, ANIM_WEAPON3, '3', -1, -1, -1}, + {"weapon 7", "Akimbo Pistols", ID_WEAPON8, ANIM_WEAPON8, '8', -1, -1, -1}, + {"weapon 8", "Knife", ID_WEAPON1, ANIM_WEAPON1, '1', -1, -1, -1}, + {"weapon 9", "Grenade", ID_WEAPON9, ANIM_WEAPON9, '9', -1, -1, -1}, {"+attack", "attack", ID_ATTACK, ANIM_ATTACK, K_CTRL, -1, -1, -1}, {"weapprev", "prev weapon", ID_WEAPPREV, ANIM_IDLE, '[', -1, -1, -1}, {"weapnext", "next weapon", ID_WEAPNEXT, ANIM_IDLE, ']', -1, -1, -1},