From b22dd40b41e5098c3c829603c538f6afedb18ab1 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 3 Jan 2014 17:06:05 +0100
Subject: [PATCH] Implement Paralyze magic effect

---
 apps/openmw/mwclass/npc.cpp           | 3 ++-
 apps/openmw/mwmechanics/actors.cpp    | 5 +++++
 apps/openmw/mwmechanics/aicombat.cpp  | 3 +++
 apps/openmw/mwmechanics/aiescort.cpp  | 1 +
 apps/openmw/mwmechanics/aitravel.cpp  | 1 +
 apps/openmw/mwmechanics/aiwander.cpp  | 1 +
 apps/openmw/mwmechanics/character.cpp | 7 +++++--
 7 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 307ad3d7c..d66552373 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -517,7 +517,8 @@ namespace MWClass
                 MWBase::Environment::get().getSoundManager()->playSound3D(victim, "critical damage", 1.0f, 1.0f);
             }
 
-            healthdmg = (otherstats.getFatigue().getCurrent() < 1.0f);
+            healthdmg = (otherstats.getFatigue().getCurrent() < 1.0f)
+                    || (otherstats.getMagicEffects().get(ESM::MagicEffect::Paralyze).mMagnitude > 0);
             if(stats.isWerewolf())
             {
                 healthdmg = true;
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ec3b86137..108be6159 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -797,7 +797,12 @@ namespace MWMechanics
                 iter->second->updateContinuousVfx();
 
             for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+            {
+                if (iter->first.getClass().getCreatureStats(iter->first).getMagicEffects().get(
+                            ESM::MagicEffect::Paralyze).mMagnitude > 0)
+                    iter->second->skipAnim();
                 iter->second->update(duration);
+            }
         }
     }
     void Actors::restoreDynamicStats()
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 39a97df6c..6f643aa68 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -91,6 +91,8 @@ namespace MWMechanics
         mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]);
 
         float zAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
+
+        // TODO: use movement settings instead of rotating directly
         MWBase::Environment::get().getWorld()->rotateObject(actor, 0, 0, zAngle, false);
         MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 1;
 
@@ -105,6 +107,7 @@ namespace MWMechanics
             float directionResult = sqrt(directionX * directionX + directionY * directionY);
 
             zAngle = Ogre::Radian( acos(directionY / directionResult) * sgn(asin(directionX / directionResult)) ).valueDegrees();
+            // TODO: use movement settings instead of rotating directly
             MWBase::Environment::get().getWorld()->rotateObject(actor, 0, 0, zAngle, false);
 
             mPathFinder.clearPath();
diff --git a/apps/openmw/mwmechanics/aiescort.cpp b/apps/openmw/mwmechanics/aiescort.cpp
index 3615c8546..5099625c0 100644
--- a/apps/openmw/mwmechanics/aiescort.cpp
+++ b/apps/openmw/mwmechanics/aiescort.cpp
@@ -161,6 +161,7 @@ namespace MWMechanics
         if(distanceBetweenResult <= mMaxDist * mMaxDist)
         {
             float zAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
+            // TODO: use movement settings instead of rotating directly
             MWBase::Environment::get().getWorld()->rotateObject(actor, 0, 0, zAngle, false);
             MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 1;
             mMaxDist = 470;
diff --git a/apps/openmw/mwmechanics/aitravel.cpp b/apps/openmw/mwmechanics/aitravel.cpp
index 08d758638..f56c75996 100644
--- a/apps/openmw/mwmechanics/aitravel.cpp
+++ b/apps/openmw/mwmechanics/aitravel.cpp
@@ -97,6 +97,7 @@ namespace MWMechanics
         }
 
         float zAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
+        // TODO: use movement settings instead of rotating directly
         world->rotateObject(actor, 0, 0, zAngle, false);
         movement.mPosition[1] = 1;
 
diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index f66f7ca62..93c94a3f4 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -236,6 +236,7 @@ namespace MWMechanics
         if(mWalking)
         {
             float zAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
+            // TODO: use movement settings instead of rotating directly
             world->rotateObject(actor, 0, 0, zAngle, false);
             MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 1;
 
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 351e33f13..8a73c98af 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -955,9 +955,12 @@ void CharacterController::update(float duration)
         refreshCurrentAnims(idlestate, movestate, forcestateupdate);
 
         rot *= duration * Ogre::Math::RadiansToDegrees(1.0f);
-        world->rotateObject(mPtr, rot.x, rot.y, rot.z, true);
 
-        world->queueMovement(mPtr, vec);
+        if (!mSkipAnim)
+        {
+            world->rotateObject(mPtr, rot.x, rot.y, rot.z, true);
+            world->queueMovement(mPtr, vec);
+        }
         movement = vec;
     }
     else if(cls.getCreatureStats(mPtr).isDead())