teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Merge pull request #131 from OpenMW/master

Browse source 
Add OpenMW commits up to 21 Jan
This commit is contained in:
David Cernat 2017-01-22 11:20:20 +02:00 committed by GitHub
commit 0cd7c3ea3d
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/essimporter/importercontext.hpp
View file

@ -69,6 +69,7 @@ namespace ESSImport
mPlayer.mHasMark = 0;
mPlayer.mCurrentCrimeId = 0; // TODO
mPlayer.mObject.blank();
mPlayer.mObject.mEnabled = true;
mPlayer.mObject.mRef.mRefID = "player"; // REFR.mRefID would be PlayerSaveGame
mGlobalMapState.mBounds.mMinX = 0;

6
apps/openmw/mwworld/player.cpp
View file

@ -328,6 +328,12 @@ namespace MWWorld
throw std::runtime_error ("invalid player state record (object state)");
}
if (!player.mObject.mEnabled)
{
std::cerr << "Savegame attempted to disable the player." << std::endl;
player.mObject.mEnabled = true;
}
mPlayer.load (player.mObject);
for (int i=0; i<ESM::Attribute::Length; ++i)