From b0eb5938bfdd7ff3a24f219e6722bb2b5b790042 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 28 Nov 2013 09:13:54 +0100
Subject: [PATCH] removed some redundant code

---
 apps/openmw/mwscript/interpretercontext.cpp | 28 +++------------------
 apps/openmw/mwworld/worldimp.cpp            | 18 +++++++++++--
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index bbfa77e189..a977d34402 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -143,45 +143,23 @@ namespace MWScript
 
     void InterpreterContext::setGlobalShort (const std::string& name, int value)
     {
-        if (name=="gamehour")
-            MWBase::Environment::get().getWorld()->setHour (value);
-        else if (name=="day")
-            MWBase::Environment::get().getWorld()->setDay (value);
-        else if (name=="month")
-            MWBase::Environment::get().getWorld()->setMonth (value);
-        else
-            MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
+        MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
     }
 
     void InterpreterContext::setGlobalLong (const std::string& name, int value)
     {
-        if (name=="gamehour")
-            MWBase::Environment::get().getWorld()->setHour (value);
-        else if (name=="day")
-            MWBase::Environment::get().getWorld()->setDay (value);
-        else if (name=="month")
-            MWBase::Environment::get().getWorld()->setMonth (value);
-        else
-            MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
+        MWBase::Environment::get().getWorld()->setGlobalInt (name, value);
     }
 
     void InterpreterContext::setGlobalFloat (const std::string& name, float value)
     {
-        if (name=="gamehour")
-            MWBase::Environment::get().getWorld()->setHour (value);
-        else if (name=="day")
-            MWBase::Environment::get().getWorld()->setDay (value);
-        else if (name=="month")
-            MWBase::Environment::get().getWorld()->setMonth (value);
-        else
-            MWBase::Environment::get().getWorld()->setGlobalFloat (name, value);
+        MWBase::Environment::get().getWorld()->setGlobalFloat (name, value);
     }
 
     std::vector<std::string> InterpreterContext::getGlobals () const
     {
         MWBase::World *world = MWBase::Environment::get().getWorld();
         return world->getGlobals();
-
     }
 
     char InterpreterContext::getGlobalType (const std::string& name) const
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index afa434cd24..0767718b8c 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -424,12 +424,26 @@ namespace MWWorld
 
     void World::setGlobalInt (const std::string& name, int value)
     {
-        mGlobalVariables->setInt (name, value);
+        if (name=="gamehour")
+            setHour (value);
+        else if (name=="day")
+            setDay (value);
+        else if (name=="month")
+            setMonth (value);
+        else
+            mGlobalVariables->setInt (name, value);
     }
 
     void World::setGlobalFloat (const std::string& name, float value)
     {
-        mGlobalVariables->setFloat (name, value);
+        if (name=="gamehour")
+            setHour (value);
+        else if (name=="day")
+            setDay (value);
+        else if (name=="month")
+            setMonth (value);
+        else
+            mGlobalVariables->setFloat (name, value);
     }
 
     int World::getGlobalInt (const std::string& name) const