mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-31 04:06:42 +00:00
Code Issues Releases Wiki Activity

[General] Use regular ints for weather states for consistency w/ OpenMW

Browse source
This commit is contained in:
David Cernat 2019-10-24 20:08:08 +03:00
parent 904f804ea2
commit 0e94eb8b74
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwworld/weather.cpp
View file

@ -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);

4
apps/openmw/mwworld/weather.hpp
View file

@ -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
*/

6
components/openmw-mp/Base/BaseWorldstate.hpp
View file

@ -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;
};