mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 19:20:49 +00:00
Merge branch 'pipeline' into 'master'
Fix pipeline errors See merge request OpenMW/openmw!2219
This commit is contained in:
commit
f317cdfa8f
@ -237,7 +237,7 @@ public:
|
|||||||
{
|
{
|
||||||
CellRef refr;
|
CellRef refr;
|
||||||
refr.load(esm);
|
refr.load(esm);
|
||||||
assert(refr.mIndexedRefID == "PlayerSaveGame");
|
assert(refr.mIndexedRefId == "PlayerSaveGame");
|
||||||
mContext->mPlayer.mObject.mPosition = refr.mPos;
|
mContext->mPlayer.mObject.mPosition = refr.mPos;
|
||||||
|
|
||||||
ESM::CreatureStats& cStats = mContext->mPlayer.mObject.mCreatureStats;
|
ESM::CreatureStats& cStats = mContext->mPlayer.mObject.mCreatureStats;
|
||||||
|
@ -1347,7 +1347,7 @@ bool CharacterController::updateWeaponState(CharacterState idle)
|
|||||||
if (isPersistentAnimPlaying())
|
if (isPersistentAnimPlaying())
|
||||||
return forcestateupdate;
|
return forcestateupdate;
|
||||||
|
|
||||||
float complete;
|
float complete = 0.f;
|
||||||
bool animPlaying = false;
|
bool animPlaying = false;
|
||||||
ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
|
ESM::WeaponType::Class weapclass = getWeaponType(mWeaponType)->mWeaponClass;
|
||||||
if(getAttackingOrSpell())
|
if(getAttackingOrSpell())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user