From 0c324557f63f4ed2bba7f553ad101f53388e29f0 Mon Sep 17 00:00:00 2001
From: Sandu Liviu Catalin <slc.universe@gmail.com>
Date: Thu, 28 Jul 2016 16:50:24 +0300
Subject: [PATCH] Remove unnecessary collision checks when converting a weapon
 name to an identifier.

---
 source/Misc/Weapon.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/Misc/Weapon.cpp b/source/Misc/Weapon.cpp
index 69bf0eae..12d4cfe2 100644
--- a/source/Misc/Weapon.cpp
+++ b/source/Misc/Weapon.cpp
@@ -198,8 +198,8 @@ Int32 GetWeaponID(CCStr name)
         case 'r':
             // [Re]mote Detonation Grenade
             if (b == 'e') return SQMOD_WEAPON_REMOTE;
-            // [Ro]cket [L]aunche[r]
-            else if (b == 'o' && (d == 'r' || d == 'l' || (len > 6 && str[6] == 'l'))) return SQMOD_WEAPON_ROCKETLAUNCHER;
+            // [Ro]cket Launcher
+            else if (b == 'o') return SQMOD_WEAPON_ROCKETLAUNCHER;
             // [Ru]ger
             else if (b == 'u') return SQMOD_WEAPON_RUGER;
             // Default to unknwon