Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-02 14:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 28

Fixes for MSVC warnings, less overall changes

Browse source 
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
This commit is contained in:
slothlife 2014-05-14 20:12:52 -05:00
parent c160a04ede
commit f33559fead
19 changed files with 71 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/esm/inventorystate.hpp
View file

@ -20,6 +20,8 @@ namespace ESM
// lights (slot)
std::vector<std::pair<LightState, int> > mLights;
virtual ~InventoryState() {}
virtual void load (ESMReader &esm);
virtual void save (ESMWriter &esm) const;
};

4
components/terrain/material.cpp
View file

@ -181,7 +181,7 @@ namespace Terrain
// shadow. TODO: repeated, put in function
if (mShadows)
{
for (Ogre::uint i = 0; i < (mSplitShadows ? 3 : 1); ++i)
for (int i = 0; i < (mSplitShadows ? 3 : 1); ++i)
{
sh::MaterialInstanceTextureUnit* shadowTex = p->createTextureUnit ("shadowMap" + Ogre::StringConverter::toString(i));
shadowTex->setProperty ("content_type", sh::makeProperty<sh::StringValue> (new sh::StringValue("shadow")));
@ -334,7 +334,7 @@ namespace Terrain
// shadow
if (shadows)
{
for (Ogre::uint i = 0; i < (mSplitShadows ? 3 : 1); ++i)
for (int i = 0; i < (mSplitShadows ? 3 : 1); ++i)
{
sh::MaterialInstanceTextureUnit* shadowTex = p->createTextureUnit ("shadowMap" + Ogre::StringConverter::toString(i));
shadowTex->setProperty ("content_type", sh::makeProperty<sh::StringValue> (new sh::StringValue("shadow")));