From e6707534978a9a153003a9cb3f94ba158552b0cd Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Wed, 21 Jul 2010 14:48:03 +0200
Subject: [PATCH] fixed handling of global variables of type short

---
 apps/openmw/mwworld/globals.cpp | 2 +-
 apps/openmw/mwworld/globals.hpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index 6a45a51ec..acaa4243d 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -40,7 +40,7 @@ namespace MWWorld
                 case ESM::VT_Short:
                     
                     type = 's';
-                    value.mShort = *reinterpret_cast<const Interpreter::Type_Integer *> (
+                    value.mShort = *reinterpret_cast<const Interpreter::Type_Float *> (
                         &iter->second.value);
                     break;
                     
diff --git a/apps/openmw/mwworld/globals.hpp b/apps/openmw/mwworld/globals.hpp
index 96ec3f3ce..f946b8d14 100644
--- a/apps/openmw/mwworld/globals.hpp
+++ b/apps/openmw/mwworld/globals.hpp
@@ -21,7 +21,7 @@ namespace MWWorld
             {
                 Interpreter::Type_Float mFloat;
                 Interpreter::Type_Float mLong; // Why Morrowind, why? :(
-                Interpreter::Type_Integer mShort;
+                Interpreter::Type_Float mShort;
             };
         
             typedef std::map<std::string, std::pair<char, Data> > Collection;