Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-30 13:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 29

Merge remote-tracking branch 'remotes/upstream/master' into QtOgre

Browse source 
Conflicts:
	apps/opencs/CMakeLists.txt
This commit is contained in:
cc9cii 2014-10-13 20:45:30 +11:00
commit 313aed078e
38 changed files with 466 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/esmterrain/storage.cpp
View file

@ -34,8 +34,8 @@ namespace ESMTerrain
if (!land)
return false;
min = std::numeric_limits<float>().max();
max = -std::numeric_limits<float>().max();
min = std::numeric_limits<float>::max();
max = -std::numeric_limits<float>::max();
for (int row=0; row<ESM::Land::LAND_SIZE; ++row)
{
for (int col=0; col<ESM::Land::LAND_SIZE; ++col)

4
components/widgets/numericeditbox.hpp
View file

@ -15,8 +15,8 @@ namespace Gui
public:
NumericEditBox()
: mValue(0), mMinValue(std::numeric_limits<int>().min()),
mMaxValue(std::numeric_limits<int>().max())
: mValue(0), mMinValue(std::numeric_limits<int>::min()),
mMaxValue(std::numeric_limits<int>::max())
{}
void initialiseOverride();