mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 16:15:31 +00:00
Code Issues Releases Wiki Activity

Fix MSVC 4706 warnings

Browse source
This commit is contained in:
Andrei Kortunov 2021-04-21 09:31:44 +04:00
parent f2f2c3d873
commit 6d351b2bdd
6 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwrender/sky.cpp
View file

@ -1315,7 +1315,8 @@ public:
while (callback) while (callback)
{ {
if ((composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback))) composite = dynamic_cast<SceneUtil::CompositeStateSetUpdater*>(callback);
if (composite)
break; break;
callback = callback->getNestedCallback(); callback = callback->getNestedCallback();

11
components/bsa/compressedbsafile.cpp
View file

@ -35,7 +35,16 @@
#include <boost/iostreams/filtering_streambuf.hpp> #include <boost/iostreams/filtering_streambuf.hpp>
#include <boost/iostreams/copy.hpp> #include <boost/iostreams/copy.hpp>
#include <boost/iostreams/filter/zlib.hpp>
#if defined(_MSC_VER)
#pragma warning (push)
#pragma warning (disable : 4706)
#include <boost/iostreams/filter/zlib.hpp>
#pragma warning (pop)
#else
#include <boost/iostreams/filter/zlib.hpp>
#endif
#include <boost/iostreams/device/array.hpp> #include <boost/iostreams/device/array.hpp>
#include <components/bsa/memorystream.hpp> #include <components/bsa/memorystream.hpp>

3
components/interpreter/defines.cpp
View file

@ -176,7 +176,8 @@ namespace Interpreter{
transform(temp.begin(), temp.end(), temp.begin(), ::tolower); transform(temp.begin(), temp.end(), temp.begin(), ::tolower);
} }
if((found = check(temp, globals[j], &i, &start))){ found = check(temp, globals[j], &i, &start);
if(found){
char type = context.getGlobalType(globals[j]); char type = context.getGlobalType(globals[j]);
switch(type){ switch(type){

3
components/nifbullet/bulletnifloader.cpp
View file

@ -126,8 +126,7 @@ osg::ref_ptr<Resource::BulletShape> BulletNifLoader::load(const Nif::File& nif)
{ {
Nif::Record* r = nif.getRoot(i); Nif::Record* r = nif.getRoot(i);
assert(r != nullptr); assert(r != nullptr);
Nif::Node* node = nullptr; if (Nif::Node* node = dynamic_cast<Nif::Node*>(r))
if ((node = dynamic_cast<Nif::Node*>(r)))
roots.emplace_back(node); roots.emplace_back(node);
} }
const std::string filename = nif.getFilename(); const std::string filename = nif.getFilename();

6
components/nifosg/nifloader.cpp
View file

@ -312,8 +312,7 @@ namespace NifOsg
for (size_t i = 0; i < numRoots; ++i) for (size_t i = 0; i < numRoots; ++i)
{ {
const Nif::Record* r = nif->getRoot(i); const Nif::Record* r = nif->getRoot(i);
const Nif::Node* nifNode = nullptr; if (const Nif::Node* nifNode = dynamic_cast<const Nif::Node*>(r))
if ((nifNode = dynamic_cast<const Nif::Node*>(r)))
roots.emplace_back(nifNode); roots.emplace_back(nifNode);
} }
if (roots.empty()) if (roots.empty())
@ -609,7 +608,8 @@ namespace NifOsg
bool hasVisController = false; bool hasVisController = false;
for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next) for (Nif::ControllerPtr ctrl = nifNode->controller; !ctrl.empty(); ctrl = ctrl->next)
{ {
if ((hasVisController |= (ctrl->recType == Nif::RC_NiVisController))) hasVisController |= (ctrl->recType == Nif::RC_NiVisController);
if (hasVisController)
break; break;
} }

3
components/sceneutil/shadowsbin.cpp
View file

@ -194,8 +194,9 @@ void ShadowsBin::sortImplementation()
// noTestRoot is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state // noTestRoot is now a stategraph with useDiffuseMapForShadowAlpha disabled but minimal other state
bool cullFaceOverridden = false; bool cullFaceOverridden = false;
while ((root = root->_parent)) while (root->_parent)
{ {
root = root->_parent;
if (!root->getStateSet()) if (!root->getStateSet())
continue; continue;
unsigned int cullFaceFlags = root->getStateSet()->getMode(GL_CULL_FACE); unsigned int cullFaceFlags = root->getStateSet()->getMode(GL_CULL_FACE);