mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-29 03:36:40 +00:00
Code Issues Releases Wiki Activity

Merge branch 'multicast' into 'master'

Browse source 
Fix two excessive type casting instances

See merge request OpenMW/openmw!953
This commit is contained in:
Evil Eye 2021-06-24 17:32:25 +00:00
commit 1a421c3b2e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esm/weatherstate.cpp
View file

@ -49,7 +49,7 @@ namespace ESM
void WeatherState::save(ESMWriter& esm) const void WeatherState::save(ESMWriter& esm) const
{ {
esm.writeHNCString(currentRegionRecord, mCurrentRegion.c_str()); esm.writeHNCString(currentRegionRecord, mCurrentRegion);
esm.writeHNT(timePassedRecord, mTimePassed); esm.writeHNT(timePassedRecord, mTimePassed);
esm.writeHNT(fastForwardRecord, mFastForward); esm.writeHNT(fastForwardRecord, mFastForward);
esm.writeHNT(weatherUpdateTimeRecord, mWeatherUpdateTime); esm.writeHNT(weatherUpdateTimeRecord, mWeatherUpdateTime);

2
components/resource/imagemanager.cpp
View file

@ -94,7 +94,7 @@ namespace Resource
Files::IStreamPtr stream; Files::IStreamPtr stream;
try try
{ {
stream = mVFS->get(normalized.c_str()); stream = mVFS->get(normalized);
} }
catch (std::exception& e) catch (std::exception& e)
{ {