Silence -Wreorder warnings.

test
Rohit Nirmal 10 years ago
parent f1c0847897
commit 997347b01e

@ -24,10 +24,10 @@
const char *Launcher::DataFilesPage::mDefaultContentListName = "Default"; const char *Launcher::DataFilesPage::mDefaultContentListName = "Default";
Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings, Config::LauncherSettings &launcherSettings, QWidget *parent) Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings, Config::LauncherSettings &launcherSettings, QWidget *parent)
: mCfgMgr(cfg) : QWidget(parent)
, mCfgMgr(cfg)
, mGameSettings(gameSettings) , mGameSettings(gameSettings)
, mLauncherSettings(launcherSettings) , mLauncherSettings(launcherSettings)
, QWidget(parent)
{ {
ui.setupUi (this); ui.setupUi (this);
setObjectName ("DataFilesPage"); setObjectName ("DataFilesPage");

@ -25,7 +25,7 @@
using namespace Process; using namespace Process;
Launcher::MainDialog::MainDialog(QWidget *parent) Launcher::MainDialog::MainDialog(QWidget *parent)
: mGameSettings(mCfgMgr), QMainWindow (parent) : QMainWindow(parent), mGameSettings (mCfgMgr)
{ {
setupUi(this); setupUi(this);

@ -12,7 +12,7 @@
CSVSettings::RangeView::RangeView (CSMSettings::Setting *setting, CSVSettings::RangeView::RangeView (CSMSettings::Setting *setting,
Page *parent) Page *parent)
: mRangeWidget (0), mRangeType (setting->type()), View (setting, parent) : View (setting, parent), mRangeWidget (0), mRangeType (setting->type())
{ {
mRangeWidget = 0; mRangeWidget = 0;

@ -5,7 +5,7 @@
#include "../../model/settings/setting.hpp" #include "../../model/settings/setting.hpp"
CSVSettings::TextView::TextView(CSMSettings::Setting *setting, Page *parent) CSVSettings::TextView::TextView(CSMSettings::Setting *setting, Page *parent)
: mDelimiter (setting->delimiter()), View (setting, parent) : View (setting, parent), mDelimiter (setting->delimiter())
{ {
if (setting->isMultiLine()) if (setting->isMultiLine())

@ -174,24 +174,24 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
} }
OMW::Engine::Engine(Files::ConfigurationManager& configurationManager) OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
: mOgre (0) : mEncoding(ToUTF8::WINDOWS_1252)
, mEncoder(NULL)
, mOgre (0)
, mVerboseScripts (false) , mVerboseScripts (false)
, mSkipMenu (false) , mSkipMenu (false)
, mUseSound (true) , mUseSound (true)
, mCompileAll (false) , mCompileAll (false)
, mCompileAllDialogue (false) , mCompileAllDialogue (false)
, mWarningsMode (1) , mWarningsMode (1)
, mScriptContext (0)
, mFSStrict (false)
, mScriptConsoleMode (false) , mScriptConsoleMode (false)
, mCfgMgr(configurationManager)
, mEncoding(ToUTF8::WINDOWS_1252)
, mEncoder(NULL)
, mActivationDistanceOverride(-1) , mActivationDistanceOverride(-1)
, mGrab(true) , mGrab(true)
, mScriptBlacklistUse (true)
, mExportFonts(false) , mExportFonts(false)
, mScriptContext (0)
, mFSStrict (false)
, mScriptBlacklistUse (true)
, mNewGame (false) , mNewGame (false)
, mCfgMgr(configurationManager)
{ {
OEngine::Misc::Rng::init(); OEngine::Misc::Rng::init();
std::srand ( static_cast<unsigned int>(std::time(NULL)) ); std::srand ( static_cast<unsigned int>(std::time(NULL)) );

@ -77,8 +77,6 @@ namespace MWGui
, mMagicka(NULL) , mMagicka(NULL)
, mStamina(NULL) , mStamina(NULL)
, mDrowning(NULL) , mDrowning(NULL)
, mDrowningFrame(NULL)
, mDrowningFlash(NULL)
, mWeapImage(NULL) , mWeapImage(NULL)
, mSpellImage(NULL) , mSpellImage(NULL)
, mWeapStatus(NULL) , mWeapStatus(NULL)
@ -87,6 +85,9 @@ namespace MWGui
, mMinimap(NULL) , mMinimap(NULL)
, mCompass(NULL) , mCompass(NULL)
, mCrosshair(NULL) , mCrosshair(NULL)
, mCellNameBox(NULL)
, mDrowningFrame(NULL)
, mDrowningFlash(NULL)
, mFpsBox(NULL) , mFpsBox(NULL)
, mFpsCounter(NULL) , mFpsCounter(NULL)
, mTriangleCounter(NULL) , mTriangleCounter(NULL)
@ -94,19 +95,18 @@ namespace MWGui
, mHealthManaStaminaBaseLeft(0) , mHealthManaStaminaBaseLeft(0)
, mWeapBoxBaseLeft(0) , mWeapBoxBaseLeft(0)
, mSpellBoxBaseLeft(0) , mSpellBoxBaseLeft(0)
, mEffectBoxBaseRight(0)
, mMinimapBoxBaseRight(0) , mMinimapBoxBaseRight(0)
, mEffectBoxBaseRight(0)
, mDragAndDrop(dragAndDrop) , mDragAndDrop(dragAndDrop)
, mCellNameTimer(0.0f) , mCellNameTimer(0.0f)
, mCellNameBox(NULL) , mWeaponSpellTimer(0.f)
, mMapVisible(true) , mMapVisible(true)
, mWeaponVisible(true) , mWeaponVisible(true)
, mSpellVisible(true) , mSpellVisible(true)
, mWorldMouseOver(false) , mWorldMouseOver(false)
, mEnemyHealthTimer(-1)
, mEnemyActorId(-1) , mEnemyActorId(-1)
, mEnemyHealthTimer(-1)
, mIsDrowning(false) , mIsDrowning(false)
, mWeaponSpellTimer(0.f)
, mDrowningFlashTheta(0.f) , mDrowningFlashTheta(0.f)
{ {
mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize()); mMainWidget->setSize(MyGUI::RenderManager::getInstance().getViewSize());

@ -31,11 +31,11 @@ namespace MWGui
MainMenu::MainMenu(int w, int h) MainMenu::MainMenu(int w, int h)
: OEngine::GUI::Layout("openmw_mainmenu.layout") : OEngine::GUI::Layout("openmw_mainmenu.layout")
, mButtonBox(0), mWidth (w), mHeight (h) , mWidth (w), mHeight (h), mButtonBox(0)
, mSaveGameDialog(NULL)
, mBackground(NULL) , mBackground(NULL)
, mVideoBackground(NULL) , mVideoBackground(NULL)
, mVideo(NULL) , mVideo(NULL)
, mSaveGameDialog(NULL)
{ {
getWidget(mVersionText, "VersionText"); getWidget(mVersionText, "VersionText");
std::stringstream sstream; std::stringstream sstream;

@ -24,10 +24,10 @@ namespace MWGui
struct MagicEffectInfo struct MagicEffectInfo
{ {
MagicEffectInfo() MagicEffectInfo()
: mPermanent(false) : mMagnitude(0)
, mMagnitude(0)
, mRemainingTime(0.f) , mRemainingTime(0.f)
, mTotalTime(0.f) , mTotalTime(0.f)
, mPermanent(false)
{} {}
std::string mSource; // display name for effect source (e.g. potion name) std::string mSource; // display name for effect source (e.g. potion name)
MWMechanics::EffectKey mKey; MWMechanics::EffectKey mKey;

@ -24,9 +24,9 @@ namespace MWGui
bool mActive; // (Items only) is the item equipped? bool mActive; // (Items only) is the item equipped?
Spell() Spell()
: mSelected(false) : mType(Type_Spell)
, mSelected(false)
, mActive(false) , mActive(false)
, mType(Type_Spell)
{ {
} }
}; };

@ -21,9 +21,9 @@ namespace MWGui
} }
SpellView::SpellView() SpellView::SpellView()
: mShowCostColumn(true) : mScrollView(NULL)
, mShowCostColumn(true)
, mHighlightSelected(true) , mHighlightSelected(true)
, mScrollView(NULL)
{ {
} }

@ -20,10 +20,10 @@ namespace MWGui
{ {
public: public:
ToolTipInfo() ToolTipInfo()
: isPotion(false) : imageSize(32)
, imageSize(32)
, wordWrap(true)
, remainingEnchantCharge(-1) , remainingEnchantCharge(-1)
, isPotion(false)
, wordWrap(true)
{} {}
std::string caption; std::string caption;

@ -54,10 +54,10 @@ namespace MWGui
TradeWindow::TradeWindow() TradeWindow::TradeWindow()
: WindowBase("openmw_trade_window.layout") : WindowBase("openmw_trade_window.layout")
, mCurrentBalance(0)
, mItemToSell(-1)
, mTradeModel(NULL)
, mSortModel(NULL) , mSortModel(NULL)
, mTradeModel(NULL)
, mItemToSell(-1)
, mCurrentBalance(0)
, mCurrentMerchantOffer(0) , mCurrentMerchantOffer(0)
{ {
getWidget(mFilterAll, "AllButton"); getWidget(mFilterAll, "AllButton");

@ -36,17 +36,17 @@ namespace MWGui
struct SpellEffectParams struct SpellEffectParams
{ {
SpellEffectParams() SpellEffectParams()
: mMagnMin(-1) : mNoTarget(false)
, mIsConstant(false)
, mKnown(true)
, mEffectID(-1)
, mSkill(-1)
, mAttribute(-1)
, mMagnMin(-1)
, mMagnMax(-1) , mMagnMax(-1)
, mRange(-1) , mRange(-1)
, mDuration(-1) , mDuration(-1)
, mSkill(-1)
, mArea(0) , mArea(0)
, mAttribute(-1)
, mEffectID(-1)
, mNoTarget(false)
, mIsConstant(false)
, mKnown(true)
{ {
} }

@ -102,6 +102,7 @@ namespace MWGui
const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts, const std::string& logpath, const std::string& cacheDir, bool consoleOnlyScripts,
Translation::Storage& translationDataStorage, ToUTF8::FromType encoding, bool exportFonts, const std::map<std::string, std::string>& fallbackMap) Translation::Storage& translationDataStorage, ToUTF8::FromType encoding, bool exportFonts, const std::map<std::string, std::string>& fallbackMap)
: mConsoleOnlyScripts(consoleOnlyScripts) : mConsoleOnlyScripts(consoleOnlyScripts)
, mCurrentModals()
, mGuiManager(NULL) , mGuiManager(NULL)
, mRendering(ogre) , mRendering(ogre)
, mHud(NULL) , mHud(NULL)
@ -135,8 +136,8 @@ namespace MWGui
, mTrainingWindow(NULL) , mTrainingWindow(NULL)
, mMerchantRepair(NULL) , mMerchantRepair(NULL)
, mSoulgemDialog(NULL) , mSoulgemDialog(NULL)
, mRecharge(NULL)
, mRepair(NULL) , mRepair(NULL)
, mRecharge(NULL)
, mCompanionWindow(NULL) , mCompanionWindow(NULL)
, mVideoBackground(NULL) , mVideoBackground(NULL)
, mVideoWidget(NULL) , mVideoWidget(NULL)
@ -159,8 +160,8 @@ namespace MWGui
, mPlayerName() , mPlayerName()
, mPlayerRaceId() , mPlayerRaceId()
, mPlayerAttributes() , mPlayerAttributes()
, mPlayerMinorSkills()
, mPlayerMajorSkills() , mPlayerMajorSkills()
, mPlayerMinorSkills()
, mPlayerSkillValues() , mPlayerSkillValues()
, mGui(NULL) , mGui(NULL)
, mGuiModes() , mGuiModes()
@ -173,7 +174,6 @@ namespace MWGui
, mFPS(0.0f) , mFPS(0.0f)
, mTriangleCount(0) , mTriangleCount(0)
, mBatchCount(0) , mBatchCount(0)
, mCurrentModals()
, mFallbackMap(fallbackMap) , mFallbackMap(fallbackMap)
{ {
// Set up the GUI system // Set up the GUI system

@ -102,32 +102,32 @@ namespace MWInput
OMW::Engine& engine, OMW::Engine& engine,
const std::string& userFile, bool userFileExists, const std::string& userFile, bool userFileExists,
const std::string& controllerBindingsFile, bool grab) const std::string& controllerBindingsFile, bool grab)
: mOgre(ogre) : mJoystickLastUsed(false)
, mOgre(ogre)
, mPlayer(NULL) , mPlayer(NULL)
, mEngine(engine) , mEngine(engine)
, mMouseLookEnabled(false)
, mMouseX(ogre.getWindow()->getWidth ()/2.f)
, mMouseY(ogre.getWindow()->getHeight ()/2.f)
, mMouseWheel(0)
, mDragDrop(false)
, mGuiCursorEnabled(true)
, mUserFile(userFile) , mUserFile(userFile)
, mUserFileExists(userFileExists) , mDragDrop(false)
, mGrabCursor (Settings::Manager::getBool("grab cursor", "Input"))
, mInvertY (Settings::Manager::getBool("invert y axis", "Input")) , mInvertY (Settings::Manager::getBool("invert y axis", "Input"))
, mControlsDisabled(false)
, mCameraSensitivity (Settings::Manager::getFloat("camera sensitivity", "Input")) , mCameraSensitivity (Settings::Manager::getFloat("camera sensitivity", "Input"))
, mUISensitivity (Settings::Manager::getFloat("ui sensitivity", "Input")) , mUISensitivity (Settings::Manager::getFloat("ui sensitivity", "Input"))
, mCameraYMultiplier (Settings::Manager::getFloat("camera y multiplier", "Input")) , mCameraYMultiplier (Settings::Manager::getFloat("camera y multiplier", "Input"))
, mGrabCursor (Settings::Manager::getBool("grab cursor", "Input"))
, mPreviewPOVDelay(0.f) , mPreviewPOVDelay(0.f)
, mTimeIdle(0.f) , mTimeIdle(0.f)
, mMouseLookEnabled(false)
, mGuiCursorEnabled(true)
, mDetectingKeyboard(false)
, mOverencumberedMessageDelay(0.f) , mOverencumberedMessageDelay(0.f)
, mMouseX(ogre.getWindow()->getWidth ()/2.f)
, mMouseY(ogre.getWindow()->getHeight ()/2.f)
, mMouseWheel(0)
, mUserFileExists(userFileExists)
, mAlwaysRunActive(Settings::Manager::getBool("always run", "Input")) , mAlwaysRunActive(Settings::Manager::getBool("always run", "Input"))
, mSneakToggles(Settings::Manager::getBool("toggle sneak", "Input")) , mSneakToggles(Settings::Manager::getBool("toggle sneak", "Input"))
, mSneaking(false) , mSneaking(false)
, mAttemptJump(false) , mAttemptJump(false)
, mControlsDisabled(false)
, mJoystickLastUsed(false)
, mDetectingKeyboard(false)
, mFakeDeviceID(1) , mFakeDeviceID(1)
{ {

@ -66,7 +66,7 @@ namespace MWMechanics
public: public:
/// \a weapon may be empty for hand-to-hand combat /// \a weapon may be empty for hand-to-hand combat
ActionWeapon(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo = MWWorld::Ptr()) ActionWeapon(const MWWorld::Ptr& weapon, const MWWorld::Ptr& ammo = MWWorld::Ptr())
: mWeapon(weapon), mAmmunition(ammo) {} : mAmmunition(ammo), mWeapon(weapon) {}
/// Equips the given weapon. /// Equips the given weapon.
virtual void prepare(const MWWorld::Ptr& actor); virtual void prepare(const MWWorld::Ptr& actor);
virtual void getCombatRange (float& rangeAttack, float& rangeFollow); virtual void getCombatRange (float& rangeAttack, float& rangeFollow);

@ -65,6 +65,7 @@ void Animation::EffectAnimationTime::setValue(Ogre::Real)
Animation::Animation(const MWWorld::Ptr &ptr, Ogre::SceneNode *node) Animation::Animation(const MWWorld::Ptr &ptr, Ogre::SceneNode *node)
: mPtr(ptr) : mPtr(ptr)
, mGlowLight(NULL)
, mInsert(node) , mInsert(node)
, mSkelBase(NULL) , mSkelBase(NULL)
, mAccumRoot(NULL) , mAccumRoot(NULL)
@ -72,7 +73,6 @@ Animation::Animation(const MWWorld::Ptr &ptr, Ogre::SceneNode *node)
, mNonAccumCtrl(NULL) , mNonAccumCtrl(NULL)
, mAccumulate(0.0f) , mAccumulate(0.0f)
, mNullAnimationTimePtr(OGRE_NEW NullAnimationTime) , mNullAnimationTimePtr(OGRE_NEW NullAnimationTime)
, mGlowLight(NULL)
{ {
for(size_t i = 0;i < sNumGroups;i++) for(size_t i = 0;i < sNumGroups;i++)
mAnimationTimePtr[i].bind(OGRE_NEW AnimationTime(this)); mAnimationTimePtr[i].bind(OGRE_NEW AnimationTime(this));

@ -25,7 +25,12 @@ namespace MWRender
CharacterPreview::CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name, CharacterPreview::CharacterPreview(MWWorld::Ptr character, int sizeX, int sizeY, const std::string& name,
Ogre::Vector3 position, Ogre::Vector3 lookAt) Ogre::Vector3 position, Ogre::Vector3 lookAt)
: mSceneMgr (0) : mRecover(false)
, mRenderTarget(NULL)
, mViewport(NULL)
, mCamera(NULL)
, mSceneMgr (0)
, mNode(NULL)
, mPosition(position) , mPosition(position)
, mLookAt(lookAt) , mLookAt(lookAt)
, mCharacter(character) , mCharacter(character)
@ -33,11 +38,6 @@ namespace MWRender
, mName(name) , mName(name)
, mSizeX(sizeX) , mSizeX(sizeX)
, mSizeY(sizeY) , mSizeY(sizeY)
, mRenderTarget(NULL)
, mViewport(NULL)
, mCamera(NULL)
, mNode(NULL)
, mRecover(false)
{ {
mCharacter.mCell = NULL; mCharacter.mCell = NULL;
} }
@ -161,9 +161,9 @@ namespace MWRender
InventoryPreview::InventoryPreview(MWWorld::Ptr character) InventoryPreview::InventoryPreview(MWWorld::Ptr character)
: CharacterPreview(character, 512, 1024, "CharacterPreview", Ogre::Vector3(0, 71, -700), Ogre::Vector3(0,71,0)) : CharacterPreview(character, 512, 1024, "CharacterPreview", Ogre::Vector3(0, 71, -700), Ogre::Vector3(0,71,0))
, mSelectionBuffer(NULL)
, mSizeX(0) , mSizeX(0)
, mSizeY(0) , mSizeY(0)
, mSelectionBuffer(NULL)
{ {
} }

@ -155,10 +155,10 @@ ManualObject *Debugging::createPathgridPoints(const ESM::Pathgrid *pathgrid)
} }
Debugging::Debugging(SceneNode *root, OEngine::Physic::PhysicEngine *engine) : Debugging::Debugging(SceneNode *root, OEngine::Physic::PhysicEngine *engine) :
mRootNode(root), mEngine(engine), mEngine(engine), mSceneMgr(root->getCreator()),
mSceneMgr(root->getCreator()),
mPathgridEnabled(false), mPathgridEnabled(false),
mInteriorPathgridNode(NULL), mPathGridRoot(NULL), mRootNode(root),
mPathGridRoot(NULL), mInteriorPathgridNode(NULL),
mGridMatsCreated(false) mGridMatsCreated(false)
{ {
ResourceGroupManager::getSingleton().createResourceGroup(DEBUGGING_GROUP); ResourceGroupManager::getSingleton().createResourceGroup(DEBUGGING_GROUP);

@ -25,9 +25,9 @@ using namespace MWRender;
using namespace Ogre; using namespace Ogre;
LocalMap::LocalMap(OEngine::Render::OgreRenderer* rend, MWRender::RenderingManager* rendering) LocalMap::LocalMap(OEngine::Render::OgreRenderer* rend, MWRender::RenderingManager* rendering)
: mInterior(false) : mMapResolution(Settings::Manager::getInt("local map resolution", "Map"))
, mAngle(0.f) , mAngle(0.f)
, mMapResolution(Settings::Manager::getInt("local map resolution", "Map")) , mInterior(false)
{ {
mRendering = rend; mRendering = rend;
mRenderingManager = rendering; mRenderingManager = rendering;

@ -91,7 +91,7 @@ namespace MWRender
{ {
HeadAnimationTime::HeadAnimationTime(MWWorld::Ptr reference) HeadAnimationTime::HeadAnimationTime(MWWorld::Ptr reference)
: mReference(reference), mTalkStart(0), mTalkStop(0), mBlinkStart(0), mBlinkStop(0), mValue(0), mEnabled(true) : mReference(reference), mTalkStart(0), mTalkStop(0), mBlinkStart(0), mBlinkStop(0), mEnabled(true), mValue(0)
{ {
resetBlinkTimer(); resetBlinkTimer();
} }
@ -203,17 +203,17 @@ NpcAnimation::~NpcAnimation()
NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, int visibilityFlags, bool disableListener, bool disableSounds, ViewMode viewMode) NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, Ogre::SceneNode* node, int visibilityFlags, bool disableListener, bool disableSounds, ViewMode viewMode)
: Animation(ptr, node), : Animation(ptr, node),
mVisibilityFlags(visibilityFlags),
mListenerDisabled(disableListener), mListenerDisabled(disableListener),
mViewMode(viewMode), mViewMode(viewMode),
mShowWeapons(false), mShowWeapons(false),
mShowCarriedLeft(true), mShowCarriedLeft(true),
mNpcType(Type_Normal),
mVisibilityFlags(visibilityFlags),
mFirstPersonOffset(0.f, 0.f, 0.f), mFirstPersonOffset(0.f, 0.f, 0.f),
mAlpha(1.f), mAlpha(1.f),
mNpcType(Type_Normal),
mSoundsDisabled(disableSounds), mSoundsDisabled(disableSounds),
mHeadPitch(0.f), mHeadYaw(0.f),
mHeadYaw(0.f) mHeadPitch(0.f)
{ {
mNpc = mPtr.get<ESM::NPC>()->mBase; mNpc = mPtr.get<ESM::NPC>()->mBase;

@ -56,14 +56,14 @@ namespace MWRender {
RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const boost::filesystem::path& resDir, RenderingManager::RenderingManager(OEngine::Render::OgreRenderer& _rend, const boost::filesystem::path& resDir,
const boost::filesystem::path& cacheDir, OEngine::Physic::PhysicEngine* engine, const boost::filesystem::path& cacheDir, OEngine::Physic::PhysicEngine* engine,
MWWorld::Fallback* fallback) MWWorld::Fallback* fallback)
: mRendering(_rend) : mSunEnabled(0)
, mFallback(fallback) , mFallback(fallback)
, mTerrain(NULL)
, mRendering(_rend)
, mEffectManager(NULL)
, mPlayerAnimation(NULL) , mPlayerAnimation(NULL)
, mAmbientMode(0) , mAmbientMode(0)
, mSunEnabled(0)
, mPhysicsEngine(engine) , mPhysicsEngine(engine)
, mTerrain(NULL)
, mEffectManager(NULL)
, mRenderWorld(true) , mRenderWorld(true)
{ {
mActors = new MWRender::Actors(mRendering, this); mActors = new MWRender::Actors(mRendering, this);

@ -247,9 +247,13 @@ unsigned int Moon::getPhaseInt() const
} }
SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera) SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera)
: mHour(0.0f) : mCreated(false)
, mMoonRed(false)
, mIsStorm(false)
, mHour(0.0f)
, mDay(0) , mDay(0)
, mMonth(0) , mMonth(0)
, mCloudAnimationTimer(0.f)
, mSun(NULL) , mSun(NULL)
, mSunGlare(NULL) , mSunGlare(NULL)
, mMasser(NULL) , mMasser(NULL)
@ -260,6 +264,9 @@ SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera)
, mAtmosphereDay(NULL) , mAtmosphereDay(NULL)
, mAtmosphereNight(NULL) , mAtmosphereNight(NULL)
, mCloudNode(NULL) , mCloudNode(NULL)
, mParticleNode(NULL)
, mRainTimer(0)
, mStormDirection(0,-1,0)
, mClouds() , mClouds()
, mNextClouds() , mNextClouds()
, mCloudBlendFactor(0.0f) , mCloudBlendFactor(0.0f)
@ -268,22 +275,15 @@ SkyManager::SkyManager(Ogre::SceneNode *root, Ogre::Camera *pCamera)
, mStarsOpacity(0.0f) , mStarsOpacity(0.0f)
, mLightning(NULL) , mLightning(NULL)
, mRemainingTransitionTime(0.0f) , mRemainingTransitionTime(0.0f)
, mGlareFade(0.0f)
, mGlare(0.0f) , mGlare(0.0f)
, mGlareFade(0.0f)
, mRainEnabled(false)
, mRainSpeed(0)
, mRainFrequency(1)
, mEnabled(true) , mEnabled(true)
, mSunEnabled(true) , mSunEnabled(true)
, mMasserEnabled(true) , mMasserEnabled(true)
, mSecundaEnabled(true) , mSecundaEnabled(true)
, mCreated(false)
, mCloudAnimationTimer(0.f)
, mMoonRed(false)
, mParticleNode(NULL)
, mRainEnabled(false)
, mRainTimer(0)
, mRainSpeed(0)
, mRainFrequency(1)
, mStormDirection(0,-1,0)
, mIsStorm(false)
{ {
mSceneMgr = root->getCreator(); mSceneMgr = root->getCreator();
mRootNode = mSceneMgr->getRootSceneNode()->createChildSceneNode(); mRootNode = mSceneMgr->getRootSceneNode()->createChildSceneNode();

@ -46,10 +46,10 @@ namespace MWRender {
{ {
public: public:
Reflection(Ogre::SceneManager* sceneManager) Reflection(Ogre::SceneManager* sceneManager)
: mSceneMgr(sceneManager) : mCamera(NULL)
, mIsUnderwater(false)
, mCamera(NULL)
, mParentCamera(NULL) , mParentCamera(NULL)
, mSceneMgr(sceneManager)
, mIsUnderwater(false)
{} {}
virtual ~Reflection() {} virtual ~Reflection() {}

@ -25,10 +25,10 @@
using namespace Process; using namespace Process;
Wizard::MainWizard::MainWizard(QWidget *parent) : Wizard::MainWizard::MainWizard(QWidget *parent) :
mGameSettings(mCfgMgr),
QWizard(parent), QWizard(parent),
mInstallations(),
mError(false), mError(false),
mInstallations() mGameSettings(mCfgMgr)
{ {
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
setWizardStyle(QWizard::ModernStyle); setWizardStyle(QWizard::ModernStyle);

@ -21,9 +21,9 @@ ESM_Context ESMReader::getContext()
} }
ESMReader::ESMReader() ESMReader::ESMReader()
: mBuffer(50*1024) : mIdx(0)
, mRecordFlags(0) , mRecordFlags(0)
, mIdx(0) , mBuffer(50*1024)
, mGlobalReaderList(NULL) , mGlobalReaderList(NULL)
, mEncoder(NULL) , mEncoder(NULL)
{ {

@ -9,10 +9,10 @@
namespace ESM namespace ESM
{ {
ESMWriter::ESMWriter() ESMWriter::ESMWriter()
: mEncoder (0) : mStream(NULL)
, mEncoder (0)
, mRecordCount (0) , mRecordCount (0)
, mCounting (true) , mCounting (true)
, mStream(NULL)
{} {}
unsigned int ESMWriter::getVersion() const unsigned int ESMWriter::getVersion() const

@ -78,9 +78,9 @@ struct Cell
float mFogDensity; float mFogDensity;
}; };
Cell() : mWater(0), Cell() : mName(""),
mName(""),
mRegion(""), mRegion(""),
mWater(0),
mWaterInt(false), mWaterInt(false),
mMapColor(0), mMapColor(0),
mRefNumCounter(0) mRefNumCounter(0)

@ -67,11 +67,11 @@ Land::Land()
: mFlags(0) : mFlags(0)
, mX(0) , mX(0)
, mY(0) , mY(0)
, mPlugin(0)
, mEsm(NULL) , mEsm(NULL)
, mDataTypes(0) , mDataTypes(0)
, mDataLoaded(false) , mDataLoaded(false)
, mLandData(NULL) , mLandData(NULL)
, mPlugin(0)
{ {
} }

@ -57,8 +57,8 @@ struct FixedPath
, mGlobalConfigPath(mPath.getGlobalConfigPath()) , mGlobalConfigPath(mPath.getGlobalConfigPath())
, mLocalPath(mPath.getLocalPath()) , mLocalPath(mPath.getLocalPath())
, mGlobalDataPath(mPath.getGlobalDataPath()) , mGlobalDataPath(mPath.getGlobalDataPath())
, mInstallPath(mPath.getInstallPath())
, mCachePath(mPath.getCachePath()) , mCachePath(mPath.getCachePath())
, mInstallPath(mPath.getInstallPath())
{ {
} }

@ -35,7 +35,7 @@ public:
NIFFile * const file; NIFFile * const file;
NIFStream (NIFFile * file, Ogre::DataStreamPtr inp): file (file), inp (inp) {} NIFStream (NIFFile * file, Ogre::DataStreamPtr inp): inp (inp), file (file) {}
void skip(size_t size) { inp->skip(size); } void skip(size_t size) { inp->skip(size); }

@ -69,8 +69,8 @@ class ManualBulletShapeLoader : public OEngine::Physic::BulletShapeLoader
public: public:
ManualBulletShapeLoader(bool showMarkers=false) ManualBulletShapeLoader(bool showMarkers=false)
: mShape(NULL) : mShape(NULL)
, mStaticMesh(NULL)
, mCompoundShape(NULL) , mCompoundShape(NULL)
, mStaticMesh(NULL)
, mBoundingBox(NULL) , mBoundingBox(NULL)
, mShowMarkers(showMarkers) , mShowMarkers(showMarkers)
{ {

@ -75,7 +75,7 @@ struct ObjectScene {
std::vector<Ogre::Controller<Ogre::Real> > mControllers; std::vector<Ogre::Controller<Ogre::Real> > mControllers;
ObjectScene(Ogre::SceneManager* sceneMgr) : mSkelBase(0), mMaxControllerLength(0), mSceneMgr(sceneMgr) ObjectScene(Ogre::SceneManager* sceneMgr) : mSkelBase(0), mSceneMgr(sceneMgr), mMaxControllerLength(0)
{ } { }
~ObjectScene(); ~ObjectScene();

@ -78,15 +78,15 @@ namespace Terrain
DefaultWorld::DefaultWorld(Ogre::SceneManager* sceneMgr, DefaultWorld::DefaultWorld(Ogre::SceneManager* sceneMgr,
Storage* storage, int visibilityFlags, bool shaders, Alignment align, float minBatchSize, float maxBatchSize) Storage* storage, int visibilityFlags, bool shaders, Alignment align, float minBatchSize, float maxBatchSize)
: World(sceneMgr, storage, visibilityFlags, shaders, align) : World(sceneMgr, storage, visibilityFlags, shaders, align)
, mMinBatchSize(minBatchSize) , mWorkQueueChannel(0)
, mMaxBatchSize(maxBatchSize)
, mVisible(true) , mVisible(true)
, mMaxX(0) , mChunksLoading(0)
, mMinX(0) , mMinX(0)
, mMaxY(0) , mMaxX(0)
, mMinY(0) , mMinY(0)
, mChunksLoading(0) , mMaxY(0)
, mWorkQueueChannel(0) , mMinBatchSize(minBatchSize)
, mMaxBatchSize(maxBatchSize)
, mLayerLoadPending(true) , mLayerLoadPending(true)
{ {
#if TERRAIN_USE_SHADER == 0 #if TERRAIN_USE_SHADER == 0

@ -133,6 +133,7 @@ namespace
QuadTreeNode::QuadTreeNode(DefaultWorld* terrain, ChildDirection dir, float size, const Ogre::Vector2 &center, QuadTreeNode* parent) QuadTreeNode::QuadTreeNode(DefaultWorld* terrain, ChildDirection dir, float size, const Ogre::Vector2 &center, QuadTreeNode* parent)
: mMaterialGenerator(NULL) : mMaterialGenerator(NULL)
, mLoadState(LS_Unloaded)
, mIsDummy(false) , mIsDummy(false)
, mSize(size) , mSize(size)
, mLodLevel(Log2(static_cast<int>(mSize))) , mLodLevel(Log2(static_cast<int>(mSize)))
@ -142,9 +143,8 @@ QuadTreeNode::QuadTreeNode(DefaultWorld* terrain, ChildDirection dir, float size
, mCenter(center) , mCenter(center)
, mSceneNode(NULL) , mSceneNode(NULL)
, mParent(parent) , mParent(parent)
, mTerrain(terrain)
, mChunk(NULL) , mChunk(NULL)
, mLoadState(LS_Unloaded) , mTerrain(terrain)
{ {
mBounds.setNull(); mBounds.setNull();
for (int i=0; i<4; ++i) for (int i=0; i<4; ++i)

@ -30,14 +30,14 @@ namespace Terrain
World::World(Ogre::SceneManager* sceneMgr, World::World(Ogre::SceneManager* sceneMgr,
Storage* storage, int visibilityFlags, bool shaders, Alignment align) Storage* storage, int visibilityFlags, bool shaders, Alignment align)
: mStorage(storage) : mShaders(shaders)
, mSceneMgr(sceneMgr)
, mVisibilityFlags(visibilityFlags)
, mShaders(shaders)
, mAlign(align)
, mCache(storage->getCellVertices())
, mShadows(false) , mShadows(false)
, mSplitShadows(false) , mSplitShadows(false)
, mAlign(align)
, mStorage(storage)
, mVisibilityFlags(visibilityFlags)
, mSceneMgr(sceneMgr)
, mCache(storage->getCellVertices())
{ {
} }

@ -9,8 +9,8 @@ namespace Gui
{ {
MWList::MWList() : MWList::MWList() :
mClient(0) mScrollView(0)
, mScrollView(0) ,mClient(0)
, mItemHeight(0) , mItemHeight(0)
{ {
} }

@ -74,13 +74,11 @@ namespace Physic
{ {
PhysicActor::PhysicActor(const std::string &name, const std::string &mesh, PhysicEngine *engine, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, float scale) PhysicActor::PhysicActor(const std::string &name, const std::string &mesh, PhysicEngine *engine, const Ogre::Vector3 &position, const Ogre::Quaternion &rotation, float scale)
: mName(name), mEngine(engine), mMesh(mesh) : mCanWaterWalk(false), mWalkingOnWater(false)
, mBody(0), mOnGround(false), mInternalCollisionMode(true) , mBody(0), mScale(scale), mForce(0.0f), mOnGround(false)
, mInternalCollisionMode(true)
, mExternalCollisionMode(true) , mExternalCollisionMode(true)
, mForce(0.0f) , mMesh(mesh), mName(name), mEngine(engine)
, mScale(scale)
, mWalkingOnWater(false)
, mCanWaterWalk(false)
{ {
if (!NifBullet::getBoundingBox(mMesh, mHalfExtents, mMeshTranslation, mMeshOrientation)) if (!NifBullet::getBoundingBox(mMesh, mHalfExtents, mMeshTranslation, mMeshOrientation))
{ {
@ -239,8 +237,8 @@ namespace Physic
PhysicEngine::PhysicEngine(BulletShapeLoader* shapeLoader) : PhysicEngine::PhysicEngine(BulletShapeLoader* shapeLoader) :
mDebugActive(0) mSceneMgr(NULL)
, mSceneMgr(NULL) , mDebugActive(0)
{ {
// Set up the collision configuration and dispatcher // Set up the collision configuration and dispatcher
collisionConfiguration = new btDefaultCollisionConfiguration(); collisionConfiguration = new btDefaultCollisionConfiguration();

@ -99,8 +99,8 @@ public:
mManualRender(false), mManualRender(false),
mCountBatch(0), mCountBatch(0),
mVertexProgramNoTexture(NULL), mVertexProgramNoTexture(NULL),
mFragmentProgramNoTexture(NULL),
mVertexProgramOneTexture(NULL), mVertexProgramOneTexture(NULL),
mFragmentProgramNoTexture(NULL),
mFragmentProgramOneTexture(NULL) mFragmentProgramOneTexture(NULL)
{ {
mTextureAddressMode.u = Ogre::TextureUnitState::TAM_CLAMP; mTextureAddressMode.u = Ogre::TextureUnitState::TAM_CLAMP;

Loading…
Cancel
Save