mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-03 13:19:40 +00:00
Fix some issues found by coverity
This commit is contained in:
parent
667c80fb2a
commit
24ae1d5ace
7 changed files with 27 additions and 3 deletions
|
@ -166,7 +166,9 @@ namespace ESSImport
|
||||||
|
|
||||||
if (i >= file2.mRecords.size())
|
if (i >= file2.mRecords.size())
|
||||||
{
|
{
|
||||||
|
std::ios::fmtflags f(std::cout.flags());
|
||||||
std::cout << "Record in file1 not present in file2: (1) 0x" << std::hex << rec.mFileOffset << std::endl;
|
std::cout << "Record in file1 not present in file2: (1) 0x" << std::hex << rec.mFileOffset << std::endl;
|
||||||
|
std::cout.flags(f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -174,7 +176,9 @@ namespace ESSImport
|
||||||
|
|
||||||
if (rec.mName != rec2.mName)
|
if (rec.mName != rec2.mName)
|
||||||
{
|
{
|
||||||
|
std::ios::fmtflags f(std::cout.flags());
|
||||||
std::cout << "Different record name at (2) 0x" << std::hex << rec2.mFileOffset << std::endl;
|
std::cout << "Different record name at (2) 0x" << std::hex << rec2.mFileOffset << std::endl;
|
||||||
|
std::cout.flags(f);
|
||||||
return; // TODO: try to recover
|
return; // TODO: try to recover
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -185,7 +189,9 @@ namespace ESSImport
|
||||||
|
|
||||||
if (j >= rec2.mSubrecords.size())
|
if (j >= rec2.mSubrecords.size())
|
||||||
{
|
{
|
||||||
|
std::ios::fmtflags f(std::cout.flags());
|
||||||
std::cout << "Subrecord in file1 not present in file2: (1) 0x" << std::hex << sub.mFileOffset << std::endl;
|
std::cout << "Subrecord in file1 not present in file2: (1) 0x" << std::hex << sub.mFileOffset << std::endl;
|
||||||
|
std::cout.flags(f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -193,8 +199,10 @@ namespace ESSImport
|
||||||
|
|
||||||
if (sub.mName != sub2.mName)
|
if (sub.mName != sub2.mName)
|
||||||
{
|
{
|
||||||
|
std::ios::fmtflags f(std::cout.flags());
|
||||||
std::cout << "Different subrecord name (" << rec.mName << "." << sub.mName << " vs. " << sub2.mName << ") at (1) 0x" << std::hex << sub.mFileOffset
|
std::cout << "Different subrecord name (" << rec.mName << "." << sub.mName << " vs. " << sub2.mName << ") at (1) 0x" << std::hex << sub.mFileOffset
|
||||||
<< " (2) 0x" << sub2.mFileOffset << std::endl;
|
<< " (2) 0x" << sub2.mFileOffset << std::endl;
|
||||||
|
std::cout.flags(f);
|
||||||
break; // TODO: try to recover
|
break; // TODO: try to recover
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -203,6 +211,8 @@ namespace ESSImport
|
||||||
if (blacklist.find(std::make_pair(rec.mName, sub.mName)) != blacklist.end())
|
if (blacklist.find(std::make_pair(rec.mName, sub.mName)) != blacklist.end())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
std::ios::fmtflags f(std::cout.flags());
|
||||||
|
|
||||||
std::cout << "Different subrecord data for " << rec.mName << "." << sub.mName << " at (1) 0x" << std::hex << sub.mFileOffset
|
std::cout << "Different subrecord data for " << rec.mName << "." << sub.mName << " at (1) 0x" << std::hex << sub.mFileOffset
|
||||||
<< " (2) 0x" << sub2.mFileOffset << std::endl;
|
<< " (2) 0x" << sub2.mFileOffset << std::endl;
|
||||||
|
|
||||||
|
@ -235,6 +245,7 @@ namespace ESSImport
|
||||||
std::cout << "\033[0m";
|
std::cout << "\033[0m";
|
||||||
}
|
}
|
||||||
std::cout << std::endl;
|
std::cout << std::endl;
|
||||||
|
std::cout.flags(f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -319,7 +330,11 @@ namespace ESSImport
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (unknownRecords.insert(n.val).second)
|
if (unknownRecords.insert(n.val).second)
|
||||||
|
{
|
||||||
|
std::ios::fmtflags f(std::cout.flags());
|
||||||
std::cerr << "unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl;
|
std::cerr << "unknown record " << n.toString() << " (0x" << std::hex << esm.getFileOffset() << ")" << std::endl;
|
||||||
|
std::cout.flags(f);
|
||||||
|
}
|
||||||
|
|
||||||
esm.skipRecord();
|
esm.skipRecord();
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,10 @@ namespace ESSImport
|
||||||
std::map<std::string, ESM::NPC> mNpcs;
|
std::map<std::string, ESM::NPC> mNpcs;
|
||||||
|
|
||||||
Context()
|
Context()
|
||||||
|
: mDay(0)
|
||||||
|
, mMonth(0)
|
||||||
|
, mYear(0)
|
||||||
|
, mHour(0.f)
|
||||||
{
|
{
|
||||||
mPlayer.mAutoMove = 0;
|
mPlayer.mAutoMove = 0;
|
||||||
ESM::CellId playerCellId;
|
ESM::CellId playerCellId;
|
||||||
|
|
|
@ -203,6 +203,8 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
|
||||||
return false; // script does not have a variable of this name.
|
return false; // script does not have a variable of this name.
|
||||||
|
|
||||||
int index = localDefs.getIndex (name);
|
int index = localDefs.getIndex (name);
|
||||||
|
if (index < 0)
|
||||||
|
return false; // shouldn't happen, we checked that variable has a type above, so must exist
|
||||||
|
|
||||||
const MWScript::Locals& locals = mActor.getRefData().getLocals();
|
const MWScript::Locals& locals = mActor.getRefData().getLocals();
|
||||||
|
|
||||||
|
|
|
@ -896,6 +896,9 @@ namespace MWGui
|
||||||
|
|
||||||
void WindowManager::updateMap()
|
void WindowManager::updateMap()
|
||||||
{
|
{
|
||||||
|
if (!mLocalMapRender)
|
||||||
|
return;
|
||||||
|
|
||||||
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
|
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
|
||||||
|
|
||||||
osg::Vec3f playerPosition = player.getRefData().getPosition().asVec3();
|
osg::Vec3f playerPosition = player.getRefData().getPosition().asVec3();
|
||||||
|
|
|
@ -59,7 +59,6 @@ namespace MWRender
|
||||||
|
|
||||||
private:
|
private:
|
||||||
osg::ref_ptr<osg::Group> mParent;
|
osg::ref_ptr<osg::Group> mParent;
|
||||||
Resource::ResourceSystem* mResourceSystem;
|
|
||||||
|
|
||||||
osg::ref_ptr<osgParticle::ParticleSystem> mParticleSystem;
|
osg::ref_ptr<osgParticle::ParticleSystem> mParticleSystem;
|
||||||
osg::ref_ptr<osg::PositionAttitudeTransform> mParticleNode;
|
osg::ref_ptr<osg::PositionAttitudeTransform> mParticleNode;
|
||||||
|
|
|
@ -119,7 +119,7 @@ class Drawable : public osg::Drawable {
|
||||||
|
|
||||||
// VBOs disabled due to crash in OSG: http://forum.openscenegraph.org/viewtopic.php?t=14909
|
// VBOs disabled due to crash in OSG: http://forum.openscenegraph.org/viewtopic.php?t=14909
|
||||||
osg::GLBufferObject* bufferobject = 0;//state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : 0;
|
osg::GLBufferObject* bufferobject = 0;//state->isVertexBufferObjectSupported() ? vbo->getOrCreateGLBufferObject(state->getContextID()) : 0;
|
||||||
if (bufferobject)
|
if (0)//bufferobject)
|
||||||
{
|
{
|
||||||
state->bindVertexBufferObject(bufferobject);
|
state->bindVertexBufferObject(bufferobject);
|
||||||
|
|
||||||
|
|
|
@ -407,7 +407,8 @@ FlipController::FlipController(int texSlot, float delta, std::vector<osg::ref_pt
|
||||||
}
|
}
|
||||||
|
|
||||||
FlipController::FlipController()
|
FlipController::FlipController()
|
||||||
: mDelta(0.f)
|
: mTexSlot(0)
|
||||||
|
, mDelta(0.f)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue