mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-03 17:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Remove C++11 explicit on conversion operator

Browse Source
This commit is contained in:
slothlife 2015-08-26 23:34:15 -05:00
parent 54fa5273dc
commit c907ed517d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/openmw/mwworld/weather.cpp
View File

@ -127,7 +127,13 @@ RegionWeather::RegionWeather(const ESM::RegionWeatherState& state)
RegionWeather::operator ESM::RegionWeatherState() const
{
return ESM::RegionWeatherState { mWeather, mChances };
ESM::RegionWeatherState state =
{
mWeather,
mChances
};
return state;
}
void RegionWeather::setChances(const std::vector<char>& chances)
@ -370,12 +376,12 @@ WeatherManager::WeatherManager(MWRender::RenderingManager& rendering, const MWWo
, mWeatherSettings()
, mMasser("Masser", fallback)
, mSecunda("Secunda", fallback)
, mThunderFrequency(fallback.getFallbackFloat("Weather_Thunderstorm_Thunder_Frequency"))
, mThunderThreshold(fallback.getFallbackFloat("Weather_Thunderstorm_Thunder_Threshold"))
, mThunderSoundID0(fallback.getFallbackString("Weather_Thunderstorm_Thunder_Sound_ID_0"))
, mThunderSoundID1(fallback.getFallbackString("Weather_Thunderstorm_Thunder_Sound_ID_1"))
, mThunderSoundID2(fallback.getFallbackString("Weather_Thunderstorm_Thunder_Sound_ID_2"))
, mThunderSoundID3(fallback.getFallbackString("Weather_Thunderstorm_Thunder_Sound_ID_3"))
, mThunderFrequency(fallback.getFallbackFloat("Weather_Thunderstorm_Thunder_Frequency"))
, mThunderThreshold(fallback.getFallbackFloat("Weather_Thunderstorm_Thunder_Threshold"))
, mWindSpeed(0.f)
, mIsStorm(false)
, mStormDirection(0,1,0)
@ -705,7 +711,7 @@ void WeatherManager::write(ESM::ESMWriter& writer, Loading::Listener& progress)
std::map<std::string, RegionWeather>::iterator it = mRegions.begin();
for(; it != mRegions.end(); ++it)
{
state.mRegions.insert(std::make_pair(it->first, ESM::RegionWeatherState(it->second)));
state.mRegions.insert(std::make_pair(it->first, it->second));
}
writer.startRecord(ESM::REC_WTHR);

2
apps/openmw/mwworld/weather.hpp
View File

@ -127,7 +127,7 @@ namespace MWWorld
explicit RegionWeather(const ESM::Region& region);
explicit RegionWeather(const ESM::RegionWeatherState& state);
explicit operator ESM::RegionWeatherState() const;
operator ESM::RegionWeatherState() const;
void setChances(const std::vector<char>& chances);