mirror of
https://github.com/OpenMW/openmw.git
synced 2025-03-03 13:09:40 +00:00
Initialize some missing variables
This commit is contained in:
parent
523ad825c2
commit
aa349f2ed9
11 changed files with 30 additions and 25 deletions
|
@ -21,6 +21,7 @@ void CSMDoc::Document::addGmsts()
|
||||||
ESM::GameSetting gmst;
|
ESM::GameSetting gmst;
|
||||||
gmst.mId = CSMWorld::DefaultGmsts::Floats[i];
|
gmst.mId = CSMWorld::DefaultGmsts::Floats[i];
|
||||||
gmst.mValue.setType (ESM::VT_Float);
|
gmst.mValue.setType (ESM::VT_Float);
|
||||||
|
gmst.mRecordFlags = 0;
|
||||||
gmst.mValue.setFloat (CSMWorld::DefaultGmsts::FloatsDefaultValues[i]);
|
gmst.mValue.setFloat (CSMWorld::DefaultGmsts::FloatsDefaultValues[i]);
|
||||||
getData().getGmsts().add (gmst);
|
getData().getGmsts().add (gmst);
|
||||||
}
|
}
|
||||||
|
@ -30,6 +31,7 @@ void CSMDoc::Document::addGmsts()
|
||||||
ESM::GameSetting gmst;
|
ESM::GameSetting gmst;
|
||||||
gmst.mId = CSMWorld::DefaultGmsts::Ints[i];
|
gmst.mId = CSMWorld::DefaultGmsts::Ints[i];
|
||||||
gmst.mValue.setType (ESM::VT_Int);
|
gmst.mValue.setType (ESM::VT_Int);
|
||||||
|
gmst.mRecordFlags = 0;
|
||||||
gmst.mValue.setInteger (CSMWorld::DefaultGmsts::IntsDefaultValues[i]);
|
gmst.mValue.setInteger (CSMWorld::DefaultGmsts::IntsDefaultValues[i]);
|
||||||
getData().getGmsts().add (gmst);
|
getData().getGmsts().add (gmst);
|
||||||
}
|
}
|
||||||
|
@ -39,6 +41,7 @@ void CSMDoc::Document::addGmsts()
|
||||||
ESM::GameSetting gmst;
|
ESM::GameSetting gmst;
|
||||||
gmst.mId = CSMWorld::DefaultGmsts::Strings[i];
|
gmst.mId = CSMWorld::DefaultGmsts::Strings[i];
|
||||||
gmst.mValue.setType (ESM::VT_String);
|
gmst.mValue.setType (ESM::VT_String);
|
||||||
|
gmst.mRecordFlags = 0;
|
||||||
gmst.mValue.setString ("");
|
gmst.mValue.setString ("");
|
||||||
getData().getGmsts().add (gmst);
|
getData().getGmsts().add (gmst);
|
||||||
}
|
}
|
||||||
|
@ -164,6 +167,7 @@ void CSMDoc::Document::createBase()
|
||||||
{
|
{
|
||||||
ESM::Global record;
|
ESM::Global record;
|
||||||
record.mId = sGlobals[i];
|
record.mId = sGlobals[i];
|
||||||
|
record.mRecordFlags = 0;
|
||||||
record.mValue.setType (i==2 ? ESM::VT_Float : ESM::VT_Long);
|
record.mValue.setType (i==2 ? ESM::VT_Float : ESM::VT_Long);
|
||||||
|
|
||||||
if (i==0 || i==1)
|
if (i==0 || i==1)
|
||||||
|
|
|
@ -1032,6 +1032,7 @@ void CSMWorld::Data::loadFallbackEntries()
|
||||||
ESM::Static newMarker;
|
ESM::Static newMarker;
|
||||||
newMarker.mId = marker.first;
|
newMarker.mId = marker.first;
|
||||||
newMarker.mModel = marker.second;
|
newMarker.mModel = marker.second;
|
||||||
|
newMarker.mRecordFlags = 0;
|
||||||
auto record = std::make_unique<CSMWorld::Record<ESM::Static>>();
|
auto record = std::make_unique<CSMWorld::Record<ESM::Static>>();
|
||||||
record->mBase = newMarker;
|
record->mBase = newMarker;
|
||||||
record->mState = CSMWorld::RecordBase::State_BaseOnly;
|
record->mState = CSMWorld::RecordBase::State_BaseOnly;
|
||||||
|
@ -1046,6 +1047,7 @@ void CSMWorld::Data::loadFallbackEntries()
|
||||||
ESM::Door newMarker;
|
ESM::Door newMarker;
|
||||||
newMarker.mId = marker.first;
|
newMarker.mId = marker.first;
|
||||||
newMarker.mModel = marker.second;
|
newMarker.mModel = marker.second;
|
||||||
|
newMarker.mRecordFlags = 0;
|
||||||
auto record = std::make_unique<CSMWorld::Record<ESM::Door>>();
|
auto record = std::make_unique<CSMWorld::Record<ESM::Door>>();
|
||||||
record->mBase = newMarker;
|
record->mBase = newMarker;
|
||||||
record->mState = CSMWorld::RecordBase::State_BaseOnly;
|
record->mState = CSMWorld::RecordBase::State_BaseOnly;
|
||||||
|
|
|
@ -27,7 +27,10 @@ namespace CSMWorld
|
||||||
const RefIdColumn *mType;
|
const RefIdColumn *mType;
|
||||||
const RefIdColumn *mBlocked;
|
const RefIdColumn *mBlocked;
|
||||||
|
|
||||||
BaseColumns () : mBlocked(nullptr) {}
|
BaseColumns () : mId(nullptr)
|
||||||
|
, mModified(nullptr)
|
||||||
|
, mType(nullptr)
|
||||||
|
, mBlocked(nullptr) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
/// \brief Base adapter for all refereceable record types
|
/// \brief Base adapter for all refereceable record types
|
||||||
|
|
|
@ -459,6 +459,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
|
||||||
, mScriptBlacklistUse (true)
|
, mScriptBlacklistUse (true)
|
||||||
, mNewGame (false)
|
, mNewGame (false)
|
||||||
, mCfgMgr(configurationManager)
|
, mCfgMgr(configurationManager)
|
||||||
|
, mGlMaxTextureImageUnits(0)
|
||||||
{
|
{
|
||||||
SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); // We use only gamepads
|
SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0"); // We use only gamepads
|
||||||
|
|
||||||
|
|
|
@ -494,6 +494,7 @@ namespace MWGui
|
||||||
klass.mDescription = mCreateClassDialog->getDescription();
|
klass.mDescription = mCreateClassDialog->getDescription();
|
||||||
klass.mData.mSpecialization = mCreateClassDialog->getSpecializationId();
|
klass.mData.mSpecialization = mCreateClassDialog->getSpecializationId();
|
||||||
klass.mData.mIsPlayable = 0x1;
|
klass.mData.mIsPlayable = 0x1;
|
||||||
|
klass.mRecordFlags = 0;
|
||||||
|
|
||||||
std::vector<int> attributes = mCreateClassDialog->getFavoriteAttributes();
|
std::vector<int> attributes = mCreateClassDialog->getFavoriteAttributes();
|
||||||
assert(attributes.size() == 2);
|
assert(attributes.size() == 2);
|
||||||
|
|
|
@ -11,17 +11,8 @@ namespace
|
||||||
const T* base = list.find(name);
|
const T* base = list.find(name);
|
||||||
|
|
||||||
ESM::CellRef cellRef;
|
ESM::CellRef cellRef;
|
||||||
cellRef.mRefNum.unset();
|
cellRef.blank();
|
||||||
cellRef.mRefID = name;
|
cellRef.mRefID = name;
|
||||||
cellRef.mScale = 1;
|
|
||||||
cellRef.mFactionRank = 0;
|
|
||||||
cellRef.mChargeInt = -1;
|
|
||||||
cellRef.mChargeIntRemainder = 0.0f;
|
|
||||||
cellRef.mGoldValue = 1;
|
|
||||||
cellRef.mEnchantmentCharge = -1;
|
|
||||||
cellRef.mTeleport = false;
|
|
||||||
cellRef.mLockLevel = 0;
|
|
||||||
cellRef.mReferenceBlocked = 0;
|
|
||||||
|
|
||||||
MWWorld::LiveCellRef<T> ref(cellRef, base);
|
MWWorld::LiveCellRef<T> ref(cellRef, base);
|
||||||
|
|
||||||
|
|
|
@ -490,6 +490,7 @@ namespace MWWorld
|
||||||
ESM::Global record;
|
ESM::Global record;
|
||||||
record.mId = params.first;
|
record.mId = params.first;
|
||||||
record.mValue = params.second;
|
record.mValue = params.second;
|
||||||
|
record.mRecordFlags = 0;
|
||||||
mStore.insertStatic(record);
|
mStore.insertStatic(record);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -509,6 +510,7 @@ namespace MWWorld
|
||||||
ESM::Static record;
|
ESM::Static record;
|
||||||
record.mId = params.first;
|
record.mId = params.first;
|
||||||
record.mModel = params.second;
|
record.mModel = params.second;
|
||||||
|
record.mRecordFlags = 0;
|
||||||
mStore.insertStatic(record);
|
mStore.insertStatic(record);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -523,6 +525,7 @@ namespace MWWorld
|
||||||
ESM::Door record;
|
ESM::Door record;
|
||||||
record.mId = params.first;
|
record.mId = params.first;
|
||||||
record.mModel = params.second;
|
record.mModel = params.second;
|
||||||
|
record.mRecordFlags = 0;
|
||||||
mStore.insertStatic(record);
|
mStore.insertStatic(record);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,7 @@ class ESMWriter;
|
||||||
|
|
||||||
struct ContItem
|
struct ContItem
|
||||||
{
|
{
|
||||||
int mCount;
|
int mCount{0};
|
||||||
std::string mItem;
|
std::string mItem;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -66,8 +66,8 @@ namespace fx
|
||||||
void initialiseOverride() override;
|
void initialiseOverride() override;
|
||||||
void notifyMouseButtonClick(MyGUI::Widget* sender);
|
void notifyMouseButtonClick(MyGUI::Widget* sender);
|
||||||
|
|
||||||
MyGUI::Button* mCheckbutton;
|
MyGUI::Button* mCheckbutton{nullptr};
|
||||||
MyGUI::Widget* mFill;
|
MyGUI::Widget* mFill{nullptr};
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class T, class UType>
|
template <class T, class UType>
|
||||||
|
@ -236,11 +236,11 @@ namespace fx
|
||||||
increment(uniform->mStep);
|
increment(uniform->mStep);
|
||||||
}
|
}
|
||||||
|
|
||||||
MyGUI::Button* mButtonDecrease;
|
MyGUI::Button* mButtonDecrease{nullptr};
|
||||||
MyGUI::Button* mButtonIncrease;
|
MyGUI::Button* mButtonIncrease{nullptr};
|
||||||
MyGUI::Widget* mDragger;
|
MyGUI::Widget* mDragger{nullptr};
|
||||||
MyGUI::Widget* mFill;
|
MyGUI::Widget* mFill{nullptr};
|
||||||
MyGUI::TextBox* mValueLabel;
|
MyGUI::TextBox* mValueLabel{nullptr};
|
||||||
T mValue;
|
T mValue;
|
||||||
|
|
||||||
int mLastPointerX;
|
int mLastPointerX;
|
||||||
|
@ -271,9 +271,9 @@ namespace fx
|
||||||
|
|
||||||
void initialiseOverride() override;
|
void initialiseOverride() override;
|
||||||
|
|
||||||
Gui::AutoSizedButton* mReset;
|
Gui::AutoSizedButton* mReset{nullptr};
|
||||||
Gui::AutoSizedTextBox* mLabel;
|
Gui::AutoSizedTextBox* mLabel{nullptr};
|
||||||
MyGUI::Widget* mClient;
|
MyGUI::Widget* mClient{nullptr};
|
||||||
std::vector<EditBase*> mBases;
|
std::vector<EditBase*> mBases;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,8 +23,8 @@ namespace LuaUi
|
||||||
void textChange(MyGUI::EditBox*);
|
void textChange(MyGUI::EditBox*);
|
||||||
|
|
||||||
MyGUI::EditBox* mEditBox = nullptr;
|
MyGUI::EditBox* mEditBox = nullptr;
|
||||||
bool mMultiline;
|
bool mMultiline{0};
|
||||||
bool mAutoSize;
|
bool mAutoSize{0};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -160,7 +160,7 @@ namespace LuaUi
|
||||||
|
|
||||||
sol::object WidgetExtension::keyEvent(MyGUI::KeyCode code) const
|
sol::object WidgetExtension::keyEvent(MyGUI::KeyCode code) const
|
||||||
{
|
{
|
||||||
SDL_Keysym keySym;
|
auto keySym = SDL_Keysym();
|
||||||
keySym.sym = SDLUtil::myGuiKeyToSdl(code);
|
keySym.sym = SDLUtil::myGuiKeyToSdl(code);
|
||||||
keySym.scancode = SDL_GetScancodeFromKey(keySym.sym);
|
keySym.scancode = SDL_GetScancodeFromKey(keySym.sym);
|
||||||
keySym.mod = SDL_GetModState();
|
keySym.mod = SDL_GetModState();
|
||||||
|
|
Loading…
Reference in a new issue