mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 10:53:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'pipeline' into 'master'

Browse source 
Fix pipeline errors

See merge request OpenMW/openmw!2219
This commit is contained in:
jvoisin 2022-07-31 12:57:58 +00:00
commit f317cdfa8f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/essimporter/converter.hpp
View file

@ -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;

2
apps/openmw/mwmechanics/character.cpp
View file

@ -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())