From 0e94eb8b7491eb1d231170c69bc7ad2a03442b45 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Thu, 24 Oct 2019 20:08:08 +0300
Subject: [PATCH] [General] Use regular ints for weather states for consistency
 w/ OpenMW

---
 apps/openmw/mwworld/weather.cpp              | 4 ++--
 apps/openmw/mwworld/weather.hpp              | 4 ++--
 components/openmw-mp/Base/BaseWorldstate.hpp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwworld/weather.cpp b/apps/openmw/mwworld/weather.cpp
index ec6781327..f2b351fd2 100644
--- a/apps/openmw/mwworld/weather.cpp
+++ b/apps/openmw/mwworld/weather.cpp
@@ -704,8 +704,8 @@ void WeatherManager::playerTeleported(const std::string& playerRegion, bool isEx
     Make it possible to set a specific weather state for a region from elsewhere
     in the code
 */
-void WeatherManager::setRegionWeather(const std::string& region, const unsigned int currentWeather, const unsigned int nextWeather,
-    const unsigned int queuedWeather, const float transitionFactor, bool force)
+void WeatherManager::setRegionWeather(const std::string& region, const int currentWeather, const int nextWeather,
+    const int queuedWeather, const float transitionFactor, bool force)
 {
     bool isSameRegion = Misc::StringUtils::ciEqual(region, mCurrentRegion);
 
diff --git a/apps/openmw/mwworld/weather.hpp b/apps/openmw/mwworld/weather.hpp
index 3c7eb14f9..a7aef0cb4 100644
--- a/apps/openmw/mwworld/weather.hpp
+++ b/apps/openmw/mwworld/weather.hpp
@@ -277,8 +277,8 @@ namespace MWWorld
             Make it possible to set a specific weather state for a region from elsewhere
             in the code
         */
-        void setRegionWeather(const std::string& region, const unsigned int currentWeather, const unsigned int nextWeather,
-            const unsigned int queuedWeather, const float transitionFactor, bool force);
+        void setRegionWeather(const std::string& region, const int currentWeather, const int nextWeather,
+            const int queuedWeather, const float transitionFactor, bool force);
         /*
             End of tes3mp addition
         */
diff --git a/components/openmw-mp/Base/BaseWorldstate.hpp b/components/openmw-mp/Base/BaseWorldstate.hpp
index 5301ec1fa..fa6842c81 100644
--- a/components/openmw-mp/Base/BaseWorldstate.hpp
+++ b/components/openmw-mp/Base/BaseWorldstate.hpp
@@ -291,9 +291,9 @@ namespace mwmp
     struct Weather
     {
         std::string region;
-        unsigned int currentWeather;
-        unsigned int nextWeather;
-        unsigned int queuedWeather;
+        int currentWeather;
+        int nextWeather;
+        int queuedWeather;
         float transitionFactor;
     };