mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 17:45:33 +00:00
Code Issues Releases Wiki Activity

Don't save to or read automove state from saved games (#5452)

Browse source
This commit is contained in:
Capostrophic 2020-06-06 15:45:48 +03:00
parent 2eb9d4ad4e
commit 1873da4c91
5 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -25,6 +25,7 @@
Bug #5427: GetDistance unknown ID error is misleading Bug #5427: GetDistance unknown ID error is misleading
Bug #5435: Enemies can't hurt the player when collision is off Bug #5435: Enemies can't hurt the player when collision is off
Bug #5441: Enemies can't push a player character when in critical strike stance Bug #5441: Enemies can't push a player character when in critical strike stance
Bug #5452: Autowalk is being included in savegames
Feature #5362: Show the soul gems' trapped soul in count dialog Feature #5362: Show the soul gems' trapped soul in count dialog
Feature #5445: Handle NiLines Feature #5445: Handle NiLines

1
apps/essimporter/importercontext.hpp
View file

@ -63,7 +63,6 @@ namespace ESSImport
, mHour(0.f) , mHour(0.f)
, mNextActorId(0) , mNextActorId(0)
{ {
mPlayer.mAutoMove = 0;
ESM::CellId playerCellId; ESM::CellId playerCellId;
playerCellId.mPaged = true; playerCellId.mPaged = true;
playerCellId.mIndex.mX = playerCellId.mIndex.mY = 0; playerCellId.mIndex.mX = playerCellId.mIndex.mY = 0;

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

@ -356,8 +356,6 @@ namespace MWWorld
else else
player.mHasMark = false; player.mHasMark = false;
player.mAutoMove = mAutoMove ? 1 : 0;
for (int i=0; i<ESM::Attribute::Length; ++i) for (int i=0; i<ESM::Attribute::Length; ++i)
mSaveAttributes[i].writeState(player.mSaveAttributes[i]); mSaveAttributes[i].writeState(player.mSaveAttributes[i]);
for (int i=0; i<ESM::Skill::Length; ++i) for (int i=0; i<ESM::Skill::Length; ++i)
@ -452,8 +450,6 @@ namespace MWWorld
mMarkedCell = 0; mMarkedCell = 0;
} }
mAutoMove = player.mAutoMove!=0;
mForwardBackward = 0; mForwardBackward = 0;
mTeleported = false; mTeleported = false;

8
components/esm/player.cpp
View file

@ -21,8 +21,9 @@ void ESM::Player::load (ESMReader &esm)
else else
mHasMark = false; mHasMark = false;
mAutoMove = 0; // Automove, no longer used.
esm.getHNOT (mAutoMove, "AMOV"); if (esm.isNextSub("AMOV"))
esm.skipHSub();
mBirthsign = esm.getHNString ("SIGN"); mBirthsign = esm.getHNString ("SIGN");
@ -66,9 +67,6 @@ void ESM::Player::save (ESMWriter &esm) const
mMarkedCell.save (esm); mMarkedCell.save (esm);
} }
if (mAutoMove)
esm.writeHNT ("AMOV", mAutoMove);
esm.writeHNString ("SIGN", mBirthsign); esm.writeHNString ("SIGN", mBirthsign);
esm.writeHNT ("CURD", mCurrentCrimeId); esm.writeHNT ("CURD", mCurrentCrimeId);

3
components/esm/player.hpp
View file

@ -25,9 +25,8 @@ namespace ESM
unsigned char mHasMark; unsigned char mHasMark;
ESM::Position mMarkedPosition; ESM::Position mMarkedPosition;
CellId mMarkedCell; CellId mMarkedCell;
unsigned char mAutoMove;
std::string mBirthsign; std::string mBirthsign;
int mCurrentCrimeId; int mCurrentCrimeId;
int mPaidCrimeId; int mPaidCrimeId;