From e4341525c859a94250de4c09165737cdd81b64e9 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 15 Feb 2013 04:45:28 -0800
Subject: [PATCH] Add a jump state

Currently unused
---
 apps/openmw/mwmechanics/character.cpp | 5 ++++-
 apps/openmw/mwmechanics/character.hpp | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c40fac40aa..376092256b 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -68,6 +68,8 @@ static const struct {
     { CharState_SwimRunLeft, "swimrunleft" },
     { CharState_SwimRunRight, "swimrunright" },
 
+    { CharState_Jump, "jump" },
+
     { CharState_Death1, "death1" },
     { CharState_Death2, "death2" },
     { CharState_Death3, "death3" },
@@ -170,11 +172,12 @@ void CharacterController::markerEvent(float time, const std::string &evt)
 
 Ogre::Vector3 CharacterController::update(float duration)
 {
+    const MWBase::World *world = MWBase::Environment::get().getWorld();
     const MWWorld::Class &cls = MWWorld::Class::get(mPtr);
     const Ogre::Vector3 &vec = cls.getMovementVector(mPtr);
     const float speed = cls.getSpeed(mPtr);
 
-    bool inwater = MWBase::Environment::get().getWorld()->isSwimming(mPtr);
+    bool inwater = world->isSwimming(mPtr);
     bool isrunning = cls.getStance(mPtr, MWWorld::Class::Run);
 
     if(std::abs(vec.x/2.0f) > std::abs(vec.y))
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index eb39070410..996687a3e1 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -45,6 +45,8 @@ enum CharacterState {
     CharState_SwimRunLeft,
     CharState_SwimRunRight,
 
+    CharState_Jump,
+
     /* Death states must be last! */
     CharState_Death1,
     CharState_Death2,