mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2024-12-29 12:20:41 +00:00
Code Issues Projects Releases Wiki Activity

ESS-import: player is no longer disabled (Bug #3246)

Browse Source
This commit is contained in:
MiroslavR 2017-01-21 03:39:51 +01:00
parent 115e563a7a
commit c64351b3e8
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)