mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-21 07:09:42 +00:00
Merge branch 'coverity_fix' into 'master'
Fix some coverity issues See merge request OpenMW/openmw!1013
This commit is contained in:
commit
223216733d
3 changed files with 12 additions and 9 deletions
|
@ -407,6 +407,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
|
|||
, mExportFonts(false)
|
||||
, mRandomSeed(0)
|
||||
, mScriptContext (nullptr)
|
||||
, mLuaManager (nullptr)
|
||||
, mFSStrict (false)
|
||||
, mScriptBlacklistUse (true)
|
||||
, mNewGame (false)
|
||||
|
@ -900,7 +901,7 @@ private:
|
|||
Engine* mEngine;
|
||||
std::mutex mMutex;
|
||||
std::condition_variable mCV;
|
||||
bool mUpdateRequest;
|
||||
bool mUpdateRequest = false;
|
||||
double mDt = 0;
|
||||
bool mIsGuiMode = false;
|
||||
std::optional<std::thread> mThread;
|
||||
|
|
|
@ -42,14 +42,14 @@ namespace MWBase
|
|||
|
||||
struct ActorControls
|
||||
{
|
||||
bool mDisableAI;
|
||||
bool mControlledFromLua;
|
||||
bool mDisableAI = false;
|
||||
bool mControlledFromLua = false;
|
||||
|
||||
bool mJump;
|
||||
bool mRun;
|
||||
float mMovement;
|
||||
float mSideMovement;
|
||||
float mTurn;
|
||||
bool mJump = false;
|
||||
bool mRun = false;
|
||||
float mMovement = 0;
|
||||
float mSideMovement = 0;
|
||||
float mTurn = 0;
|
||||
};
|
||||
|
||||
virtual ActorControls* getActorControls(const MWWorld::Ptr&) const = 0;
|
||||
|
|
|
@ -82,7 +82,9 @@ namespace LuaUtil
|
|||
sol::table LuaState::getMutableFromReadOnly(const sol::userdata& ro)
|
||||
{
|
||||
sol::stack::push(mLua, ro);
|
||||
lua_getmetatable(mLua, -1);
|
||||
int ok = lua_getmetatable(mLua, -1);
|
||||
assert(ok);
|
||||
(void)ok;
|
||||
sol::table res = sol::stack::pop<sol::table>(mLua);
|
||||
lua_pop(mLua, 1);
|
||||
return res;
|
||||
|
|
Loading…
Reference in a new issue