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

Merge remote-tracking branch 'thoronador/fix-uninitialized-members'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-01-02 18:17:25 +01:00
commit 9f6a2d00e8
7 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/opencs/model/world/refidadapterimp.cpp
View file

@ -223,7 +223,14 @@ void CSMWorld::ContainerRefIdAdapter::setData (const RefIdColumn *column, RefIdD
}
CSMWorld::CreatureColumns::CreatureColumns (const ActorColumns& actorColumns)
: ActorColumns (actorColumns)
: ActorColumns (actorColumns),
mType(NULL),
mSoul(NULL),
mScale(NULL),
mOriginal(NULL),
mCombat(NULL),
mMagic(NULL),
mStealth(NULL)
{}
CSMWorld::CreatureRefIdAdapter::CreatureRefIdAdapter (const CreatureColumns& columns)
@ -431,7 +438,14 @@ void CSMWorld::MiscRefIdAdapter::setData (const RefIdColumn *column, RefIdData&
InventoryRefIdAdapter<ESM::Miscellaneous>::setData (column, data, index, value);
}
CSMWorld::NpcColumns::NpcColumns (const ActorColumns& actorColumns) : ActorColumns (actorColumns) {}
CSMWorld::NpcColumns::NpcColumns (const ActorColumns& actorColumns)
: ActorColumns (actorColumns),
mRace(NULL),
mClass(NULL),
mFaction(NULL),
mHair(NULL),
mHead(NULL)
{}
CSMWorld::NpcRefIdAdapter::NpcRefIdAdapter (const NpcColumns& columns)
: ActorRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc, columns), mColumns (columns)
@ -587,4 +601,4 @@ void CSMWorld::WeaponRefIdAdapter::setData (const RefIdColumn *column, RefIdData
else
EnchantableRefIdAdapter<ESM::Weapon>::setData (column, data, index, value);
}
}
}

1
apps/opencs/model/world/universalid.cpp
View file

@ -131,6 +131,7 @@ namespace
}
CSMWorld::UniversalId::UniversalId (const std::string& universalId)
: mIndex(0)
{
std::string::size_type index = universalId.find (':');

2
apps/opencs/view/doc/loader.cpp
View file

@ -18,7 +18,7 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
}
CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
: mDocument (document), mAborted (false), mMessages (0)
: mDocument (document), mAborted (false), mMessages (0), mTotalRecords (0)
{
setWindowTitle (("Opening " + document->getSavePath().filename().string()).c_str());

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

@ -74,6 +74,7 @@ BillboardObject::BillboardObject( const String& textureName,
const Vector3& position,
SceneNode* rootNode,
const std::string& material)
: mVisibility(1.0f)
{
SceneManager* sceneMgr = rootNode->getCreator();

8
components/esm/loadcell.hpp
View file

@ -78,7 +78,13 @@ struct Cell
float mFogDensity;
};
Cell() : mWater(0) {}
Cell() : mWater(0),
mName(""),
mRegion(""),
mWaterInt(false),
mMapColor(0),
mRefNumCounter(0)
{}
// Interior cells are indexed by this (it's the 'id'), for exterior
// cells it is optional.

16
components/esm/loadpgrd.cpp
View file

@ -8,18 +8,28 @@ namespace ESM
{
unsigned int Pathgrid::sRecordId = REC_PGRD;
Pathgrid::Point& Pathgrid::Point::operator=(const float rhs[3]) {
Pathgrid::Point& Pathgrid::Point::operator=(const float rhs[3])
{
mX = rhs[0];
mY = rhs[1];
mZ = rhs[2];
mAutogenerated = 0;
mConnectionNum = 0;
mUnknown = 0;
return *this;
}
Pathgrid::Point::Point(const float rhs[3]) {
Pathgrid::Point::Point(const float rhs[3])
: mAutogenerated(0),
mConnectionNum(0),
mUnknown(0)
{
mX = rhs[0];
mY = rhs[1];
mZ = rhs[2];
}
Pathgrid::Point::Point():mX(0),mY(0),mZ(0) {
Pathgrid::Point::Point():mX(0),mY(0),mZ(0),mAutogenerated(0),
mConnectionNum(0),mUnknown(0)
{
}
void Pathgrid::load(ESMReader &esm)

3
libs/openengine/gui/manager.cpp
View file

@ -103,6 +103,9 @@ public:
mVertexProgramOneTexture(NULL),
mFragmentProgramOneTexture(NULL)
{
mTextureAddressMode.u = Ogre::TextureUnitState::TAM_CLAMP;
mTextureAddressMode.v = Ogre::TextureUnitState::TAM_CLAMP;
mTextureAddressMode.w = Ogre::TextureUnitState::TAM_CLAMP;
}
void initialise(Ogre::RenderWindow* _window, Ogre::SceneManager* _scene)