From 03b2e99802e9f214bb130d746796e29b35800518 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 15 Jan 2014 07:06:18 +0100
Subject: [PATCH] Remove unused Combat stance

---
 apps/openmw/mwclass/npc.cpp   | 14 --------------
 apps/openmw/mwworld/class.hpp |  2 +-
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index ef5665397..e6e1e1892 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -821,10 +821,6 @@ namespace MWClass
 
                 stats.setMovementFlag (MWMechanics::NpcStats::Flag_ForceSneak, force);
                 break;
-
-            case Combat:
-
-                throw std::runtime_error ("combat stance not enforcable for NPCs");
         }
     }
 
@@ -843,12 +839,6 @@ namespace MWClass
 
                 stats.setMovementFlag (MWMechanics::NpcStats::Flag_Sneak, set);
                 break;
-
-            case Combat:
-
-                // Combat stance ignored for now; need to be determined based on draw state instead of
-                // being maunally set.
-                break;
         }
     }
 
@@ -871,10 +861,6 @@ namespace MWClass
                     return true;
 
                 return stats.getMovementFlag (MWMechanics::NpcStats::Flag_Sneak);
-
-            case Combat:
-
-                return false;
         }
 
         return false;
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index c0b010eae..a752f76a7 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -70,7 +70,7 @@ namespace MWWorld
             /// NPC-stances.
             enum Stance
             {
-                Run, Sneak, Combat
+                Run, Sneak
             };
 
             virtual ~Class();