mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-03 13:49:40 +00:00
Merge remote-tracking branch 'thoronador/fix-uninitialized-members'
This commit is contained in:
commit
82b4148a62
17 changed files with 38 additions and 23 deletions
|
@ -33,7 +33,11 @@ QString getAspect(int x, int y)
|
||||||
}
|
}
|
||||||
|
|
||||||
Launcher::GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, GraphicsSettings &graphicsSetting, QWidget *parent)
|
Launcher::GraphicsPage::GraphicsPage(Files::ConfigurationManager &cfg, GraphicsSettings &graphicsSetting, QWidget *parent)
|
||||||
: mCfgMgr(cfg)
|
: mOgre(NULL)
|
||||||
|
, mSelectedRenderSystem(NULL)
|
||||||
|
, mOpenGLRenderSystem(NULL)
|
||||||
|
, mDirect3DRenderSystem(NULL)
|
||||||
|
, mCfgMgr(cfg)
|
||||||
, mGraphicsSettings(graphicsSetting)
|
, mGraphicsSettings(graphicsSetting)
|
||||||
, QWidget(parent)
|
, QWidget(parent)
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
|
CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
|
||||||
: mUserSettings (mCfgMgr), mDocumentManager (mCfgMgr), mViewManager (mDocumentManager),
|
: mUserSettings (mCfgMgr), mDocumentManager (mCfgMgr), mViewManager (mDocumentManager),
|
||||||
mIpcServerName ("org.openmw.OpenCS")
|
mIpcServerName ("org.openmw.OpenCS"), mServer(NULL), mClientSocket(NULL)
|
||||||
{
|
{
|
||||||
std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();
|
std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,9 @@ void CSMDoc::Operation::prepareStages()
|
||||||
}
|
}
|
||||||
|
|
||||||
CSMDoc::Operation::Operation (int type, bool ordered, bool finalAlways)
|
CSMDoc::Operation::Operation (int type, bool ordered, bool finalAlways)
|
||||||
: mType (type), mOrdered (ordered), mFinalAlways (finalAlways)
|
: mType (type), mStages(std::vector<std::pair<Stage *, int> >()), mCurrentStage(mStages.begin()),
|
||||||
|
mCurrentStep(0), mCurrentStepTotal(0), mTotalSteps(0), mOrdered (ordered),
|
||||||
|
mFinalAlways (finalAlways), mError(false)
|
||||||
{
|
{
|
||||||
connect (this, SIGNAL (finished()), this, SLOT (operationDone()));
|
connect (this, SIGNAL (finished()), this, SLOT (operationDone()));
|
||||||
}
|
}
|
||||||
|
@ -120,4 +122,4 @@ void CSMDoc::Operation::executeStage()
|
||||||
void CSMDoc::Operation::operationDone()
|
void CSMDoc::Operation::operationDone()
|
||||||
{
|
{
|
||||||
emit done (mType, mError);
|
emit done (mType, mError);
|
||||||
}
|
}
|
||||||
|
|
|
@ -127,8 +127,6 @@ namespace CSMWorld
|
||||||
template<typename ESXRecordT>
|
template<typename ESXRecordT>
|
||||||
struct Column : public ColumnBase
|
struct Column : public ColumnBase
|
||||||
{
|
{
|
||||||
int mFlags;
|
|
||||||
|
|
||||||
Column (int columnId, Display displayType, int flags = Flag_Table | Flag_Dialogue)
|
Column (int columnId, Display displayType, int flags = Flag_Table | Flag_Dialogue)
|
||||||
: ColumnBase (columnId, displayType, flags) {}
|
: ColumnBase (columnId, displayType, flags) {}
|
||||||
|
|
||||||
|
|
|
@ -148,7 +148,8 @@ std::string CSVRender::PagedWorldspaceWidget::getStartupInstruction()
|
||||||
}
|
}
|
||||||
|
|
||||||
CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget (QWidget* parent, CSMDoc::Document& document)
|
CSVRender::PagedWorldspaceWidget::PagedWorldspaceWidget (QWidget* parent, CSMDoc::Document& document)
|
||||||
: WorldspaceWidget (document, parent), mDocument (document), mWorldspace ("std::default")
|
: WorldspaceWidget (document, parent), mDocument (document), mWorldspace ("std::default"),
|
||||||
|
mControlElements(NULL)
|
||||||
{
|
{
|
||||||
QAbstractItemModel *cells =
|
QAbstractItemModel *cells =
|
||||||
document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells);
|
document.getData().getTableModel (CSMWorld::UniversalId::Type_Cells);
|
||||||
|
|
|
@ -22,10 +22,12 @@ namespace CSVRender
|
||||||
{
|
{
|
||||||
SceneWidget::SceneWidget(QWidget *parent)
|
SceneWidget::SceneWidget(QWidget *parent)
|
||||||
: QWidget(parent)
|
: QWidget(parent)
|
||||||
, mWindow(NULL)
|
|
||||||
, mCamera(NULL)
|
, mCamera(NULL)
|
||||||
, mSceneMgr(NULL), mNavigation (0), mLighting (0), mUpdate (false)
|
, mSceneMgr(NULL)
|
||||||
, mKeyForward (false), mKeyBackward (false), mKeyLeft (false), mKeyRight (false)
|
, mWindow(NULL)
|
||||||
|
, mViewport(NULL)
|
||||||
|
, mNavigation (0), mLighting (0), mUpdate (false), mKeyForward (false)
|
||||||
|
, mKeyBackward (false), mKeyLeft (false), mKeyRight (false)
|
||||||
, mKeyRollLeft (false), mKeyRollRight (false)
|
, mKeyRollLeft (false), mKeyRollRight (false)
|
||||||
, mFast (false), mDragging (false), mMod1 (false)
|
, mFast (false), mDragging (false), mMod1 (false)
|
||||||
, mFastFactor (4)
|
, mFastFactor (4)
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
#include "elements.hpp"
|
#include "elements.hpp"
|
||||||
|
|
||||||
CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
|
CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
|
||||||
: SceneWidget (parent), mDocument(document), mRun (0)
|
: SceneWidget (parent), mDocument(document), mSceneElements(0), mRun(0)
|
||||||
{
|
{
|
||||||
setAcceptDrops(true);
|
setAcceptDrops(true);
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include "view.hpp"
|
#include "view.hpp"
|
||||||
|
|
||||||
CSVSettings::SettingWindow::SettingWindow(QWidget *parent)
|
CSVSettings::SettingWindow::SettingWindow(QWidget *parent)
|
||||||
: QMainWindow(parent)
|
: QMainWindow(parent), mModel(NULL)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
void CSVSettings::SettingWindow::createPages()
|
void CSVSettings::SettingWindow::createPages()
|
||||||
|
@ -84,7 +84,7 @@ void CSVSettings::SettingWindow::createConnections
|
||||||
|
|
||||||
void CSVSettings::SettingWindow::setViewValues()
|
void CSVSettings::SettingWindow::setViewValues()
|
||||||
{
|
{
|
||||||
//iterate each page and view, setting their definintions
|
//iterate each page and view, setting their definitions
|
||||||
//if they exist in the model
|
//if they exist in the model
|
||||||
foreach (const Page *page, mPages)
|
foreach (const Page *page, mPages)
|
||||||
{
|
{
|
||||||
|
|
|
@ -74,8 +74,6 @@ namespace MWGui
|
||||||
MyGUI::TextBox* mWeaponSpellBox;
|
MyGUI::TextBox* mWeaponSpellBox;
|
||||||
MyGUI::Widget *mDrowningFrame, *mDrowningFlash;
|
MyGUI::Widget *mDrowningFrame, *mDrowningFlash;
|
||||||
|
|
||||||
MyGUI::Widget* mDummy;
|
|
||||||
|
|
||||||
MyGUI::Widget* mFpsBox;
|
MyGUI::Widget* mFpsBox;
|
||||||
MyGUI::TextBox* mFpsCounter;
|
MyGUI::TextBox* mFpsCounter;
|
||||||
MyGUI::TextBox* mTriangleCounter;
|
MyGUI::TextBox* mTriangleCounter;
|
||||||
|
|
|
@ -39,6 +39,8 @@ namespace MWGui
|
||||||
, mPreviewDirty(true)
|
, mPreviewDirty(true)
|
||||||
, mPreviewResize(true)
|
, mPreviewResize(true)
|
||||||
, mDragAndDrop(dragAndDrop)
|
, mDragAndDrop(dragAndDrop)
|
||||||
|
, mSortModel(NULL)
|
||||||
|
, mTradeModel(NULL)
|
||||||
, mSelectedItem(-1)
|
, mSelectedItem(-1)
|
||||||
, mGuiMode(GM_Inventory)
|
, mGuiMode(GM_Inventory)
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,6 +29,7 @@ namespace MWGui
|
||||||
, mButtonBox(0), mWidth (w), mHeight (h)
|
, mButtonBox(0), mWidth (w), mHeight (h)
|
||||||
, mSaveGameDialog(NULL)
|
, mSaveGameDialog(NULL)
|
||||||
, mBackground(NULL)
|
, mBackground(NULL)
|
||||||
|
, mVideoBackground(NULL)
|
||||||
, mVideo(NULL)
|
, mVideo(NULL)
|
||||||
{
|
{
|
||||||
getWidget(mVersionText, "VersionText");
|
getWidget(mVersionText, "VersionText");
|
||||||
|
@ -43,7 +44,7 @@ namespace MWGui
|
||||||
rev = rev.substr(0,10);
|
rev = rev.substr(0,10);
|
||||||
sstream << "\nRevision: " << rev;
|
sstream << "\nRevision: " << rev;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string output = sstream.str();
|
std::string output = sstream.str();
|
||||||
mVersionText->setCaption(output);
|
mVersionText->setCaption(output);
|
||||||
|
|
||||||
|
|
|
@ -447,8 +447,12 @@ namespace MWGui
|
||||||
|
|
||||||
EffectEditorBase::EffectEditorBase(Type type)
|
EffectEditorBase::EffectEditorBase(Type type)
|
||||||
: mAddEffectDialog()
|
: mAddEffectDialog()
|
||||||
|
, mAvailableEffectsList(NULL)
|
||||||
|
, mUsedEffectsView(NULL)
|
||||||
, mSelectAttributeDialog(NULL)
|
, mSelectAttributeDialog(NULL)
|
||||||
, mSelectSkillDialog(NULL)
|
, mSelectSkillDialog(NULL)
|
||||||
|
, mSelectedEffect(0)
|
||||||
|
, mSelectedKnownEffectId(0)
|
||||||
, mType(type)
|
, mType(type)
|
||||||
{
|
{
|
||||||
mAddEffectDialog.eventEffectAdded += MyGUI::newDelegate(this, &EffectEditorBase::onEffectAdded);
|
mAddEffectDialog.eventEffectAdded += MyGUI::newDelegate(this, &EffectEditorBase::onEffectAdded);
|
||||||
|
|
|
@ -123,6 +123,7 @@ namespace MWGui
|
||||||
, mScreenFader(NULL)
|
, mScreenFader(NULL)
|
||||||
, mDebugWindow(NULL)
|
, mDebugWindow(NULL)
|
||||||
, mTranslationDataStorage (translationDataStorage)
|
, mTranslationDataStorage (translationDataStorage)
|
||||||
|
, mSoftwareCursor(NULL)
|
||||||
, mCharGen(NULL)
|
, mCharGen(NULL)
|
||||||
, mInputBlocker(NULL)
|
, mInputBlocker(NULL)
|
||||||
, mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD"))
|
, mCrosshairEnabled(Settings::Manager::getBool ("crosshair", "HUD"))
|
||||||
|
|
|
@ -19,14 +19,14 @@ using namespace Ogre;
|
||||||
|
|
||||||
OcclusionQuery::OcclusionQuery(OEngine::Render::OgreRenderer* renderer, SceneNode* sunNode) :
|
OcclusionQuery::OcclusionQuery(OEngine::Render::OgreRenderer* renderer, SceneNode* sunNode) :
|
||||||
mSunTotalAreaQuery(0), mSunVisibleAreaQuery(0), mActiveQuery(0),
|
mSunTotalAreaQuery(0), mSunVisibleAreaQuery(0), mActiveQuery(0),
|
||||||
mDoQuery(0), mSunVisibility(0),
|
mBBQueryVisible(0), mBBQueryTotal(0), mSunNode(sunNode), mBBNodeReal(0),
|
||||||
|
mSunVisibility(0),
|
||||||
mWasVisible(false),
|
mWasVisible(false),
|
||||||
mActive(false),
|
mActive(false),
|
||||||
mFirstFrame(true)
|
mFirstFrame(true),
|
||||||
|
mDoQuery(0),
|
||||||
|
mRendering(renderer)
|
||||||
{
|
{
|
||||||
mRendering = renderer;
|
|
||||||
mSunNode = sunNode;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
RenderSystem* renderSystem = Root::getSingleton().getRenderSystem();
|
RenderSystem* renderSystem = Root::getSingleton().getRenderSystem();
|
||||||
|
|
||||||
|
|
|
@ -20,10 +20,9 @@ using namespace Ogre;
|
||||||
using namespace MWRender;
|
using namespace MWRender;
|
||||||
|
|
||||||
Shadows::Shadows(OEngine::Render::OgreRenderer* rend) :
|
Shadows::Shadows(OEngine::Render::OgreRenderer* rend) :
|
||||||
|
mRendering(rend), mSceneMgr(rend->getScene()), mPSSMSetup(NULL),
|
||||||
mShadowFar(1000), mFadeStart(0.9)
|
mShadowFar(1000), mFadeStart(0.9)
|
||||||
{
|
{
|
||||||
mRendering = rend;
|
|
||||||
mSceneMgr = mRendering->getScene();
|
|
||||||
recreate();
|
recreate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -69,6 +69,7 @@ BillboardObject::BillboardObject( const String& textureName,
|
||||||
}
|
}
|
||||||
|
|
||||||
BillboardObject::BillboardObject()
|
BillboardObject::BillboardObject()
|
||||||
|
: mNode(NULL), mMaterial(NULL), mEntity(NULL)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -222,6 +223,7 @@ SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera)
|
||||||
, mCloudOpacity(0.0f)
|
, mCloudOpacity(0.0f)
|
||||||
, mCloudSpeed(0.0f)
|
, mCloudSpeed(0.0f)
|
||||||
, mStarsOpacity(0.0f)
|
, mStarsOpacity(0.0f)
|
||||||
|
, mLightning(NULL)
|
||||||
, mRemainingTransitionTime(0.0f)
|
, mRemainingTransitionTime(0.0f)
|
||||||
, mGlareFade(0.0f)
|
, mGlareFade(0.0f)
|
||||||
, mGlare(0.0f)
|
, mGlare(0.0f)
|
||||||
|
|
|
@ -590,6 +590,7 @@ namespace MWWorld
|
||||||
typedef SharedIterator<ESM::Cell> iterator;
|
typedef SharedIterator<ESM::Cell> iterator;
|
||||||
|
|
||||||
Store<ESM::Cell>()
|
Store<ESM::Cell>()
|
||||||
|
: mEsmStore(NULL)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
const ESM::Cell *search(const std::string &id) const {
|
const ESM::Cell *search(const std::string &id) const {
|
||||||
|
|
Loading…
Reference in a new issue