mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2892 from Capostrophic/automove

Browse Source 
Don't save to or read automove state from saved games (#5452)
This commit is contained in:
Bret Curtis 2020-06-08 11:45:04 +02:00 committed by GitHub
commit 946cf859db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -27,6 +27,7 @@
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 #5451: Magic projectiles don't disappear with the caster
Bug #5452: Autowalk is being included in savegames
Feature #5362: Show the soul gems' trapped soul in count dialog
Feature #5445: Handle NiLines

1
apps/essimporter/importercontext.hpp
View File

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

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

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

8
components/esm/player.cpp
View File

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

3
components/esm/player.hpp
View File

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