From 1a98f8ca93cb56c81dedcafa4fbd3d4e39e1768f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 28 Aug 2014 02:09:00 +0200
Subject: [PATCH] Invalid iterator fix

---
 apps/openmw/mwmechanics/aicombat.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 94f5574bdb..a51049e852 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -289,7 +289,7 @@ namespace MWMechanics
 
         // FIXME: consider moving this stuff to ActionWeapon::getCombatRange
         const ESM::Weapon *weapon = NULL;
-        MWMechanics::WeaponType weaptype;
+        MWMechanics::WeaponType weaptype = WeapType_None;
         float weapRange = 1.0f;
 
         // Get weapon characteristics
@@ -308,7 +308,7 @@ namespace MWMechanics
                     world->getStore().get<ESM::GameSetting>().find("fHandToHandReach")->getFloat();
                 weapRange = fHandToHandReach;
             }
-            else if (weaptype != WeapType_PickProbe && weaptype != WeapType_Spell)
+            else if (weaptype != WeapType_PickProbe && weaptype != WeapType_Spell && weaptype != WeapType_None)
             {
                 // All other WeapTypes are actually weapons, so get<ESM::Weapon> is safe.
                 weapon = weaponSlot->get<ESM::Weapon>()->mBase;