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

moveref
Marc Zinnschlag 10 years ago
commit 9f6a2d00e8

@ -223,7 +223,14 @@ void CSMWorld::ContainerRefIdAdapter::setData (const RefIdColumn *column, RefIdD
} }
CSMWorld::CreatureColumns::CreatureColumns (const ActorColumns& actorColumns) 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) 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); 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) CSMWorld::NpcRefIdAdapter::NpcRefIdAdapter (const NpcColumns& columns)
: ActorRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc, columns), mColumns (columns) : ActorRefIdAdapter<ESM::NPC> (UniversalId::Type_Npc, columns), mColumns (columns)

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

@ -18,7 +18,7 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
} }
CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document) 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()); setWindowTitle (("Opening " + document->getSavePath().filename().string()).c_str());

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

@ -78,7 +78,13 @@ struct Cell
float mFogDensity; 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 // Interior cells are indexed by this (it's the 'id'), for exterior
// cells it is optional. // cells it is optional.

@ -8,18 +8,28 @@ namespace ESM
{ {
unsigned int Pathgrid::sRecordId = REC_PGRD; 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]; mX = rhs[0];
mY = rhs[1]; mY = rhs[1];
mZ = rhs[2]; mZ = rhs[2];
mAutogenerated = 0;
mConnectionNum = 0;
mUnknown = 0;
return *this; 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]; mX = rhs[0];
mY = rhs[1]; mY = rhs[1];
mZ = rhs[2]; 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) void Pathgrid::load(ESMReader &esm)

@ -103,6 +103,9 @@ public:
mVertexProgramOneTexture(NULL), mVertexProgramOneTexture(NULL),
mFragmentProgramOneTexture(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) void initialise(Ogre::RenderWindow* _window, Ogre::SceneManager* _scene)

Loading…
Cancel
Save