mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 20:53:50 +00:00
Code Issues 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.mHasMark = 0;
mPlayer.mCurrentCrimeId = 0; // TODO mPlayer.mCurrentCrimeId = 0; // TODO
mPlayer.mObject.blank(); mPlayer.mObject.blank();
mPlayer.mObject.mEnabled = true;
mPlayer.mObject.mRef.mRefID = "player"; // REFR.mRefID would be PlayerSaveGame mPlayer.mObject.mRef.mRefID = "player"; // REFR.mRefID would be PlayerSaveGame
mGlobalMapState.mBounds.mMinX = 0; 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)"); 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); mPlayer.load (player.mObject);
for (int i=0; i<ESM::Attribute::Length; ++i) for (int i=0; i<ESM::Attribute::Length; ++i)