mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-05-21 03:11:29 +00:00
Code Issues Releases Wiki Activity

Fix Touch command (bug 7765)

Browse source
This commit is contained in:
Andrei Kortunov 2024-01-14 22:10:18 +04:00
parent 51426eb754
commit a91e557c68
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -128,6 +128,7 @@
Bug #7742: Governing attribute training limit should use the modified attribute Bug #7742: Governing attribute training limit should use the modified attribute
Bug #7758: Water walking is not taken into account to compute path cost on the water Bug #7758: Water walking is not taken into account to compute path cost on the water
Bug #7761: Rain and ambient loop sounds are mutually exclusive Bug #7761: Rain and ambient loop sounds are mutually exclusive
Bug #7765: OpenMW-CS: Touch Record option is broken
Bug #7770: Sword of the Perithia: Script execution failure Bug #7770: Sword of the Perithia: Script execution failure
Feature #2566: Handle NAM9 records for manual cell references Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples

5
apps/opencs/model/world/commands.cpp
View file

@ -36,7 +36,7 @@ CSMWorld::TouchCommand::TouchCommand(IdTable& table, const std::string& id, QUnd
void CSMWorld::TouchCommand::redo() void CSMWorld::TouchCommand::redo()
{ {
mOld.reset(mTable.getRecord(mId).clone().get()); mOld = mTable.getRecord(mId).clone();
mChanged = mTable.touchRecord(mId); mChanged = mTable.touchRecord(mId);
} }
@ -181,9 +181,8 @@ const std::string& CSMWorld::TouchLandCommand::getDestinationId() const
void CSMWorld::TouchLandCommand::onRedo() void CSMWorld::TouchLandCommand::onRedo()
{ {
mOld = mLands.getRecord(mId).clone();
mChanged = mLands.touchRecord(mId); mChanged = mLands.touchRecord(mId);
if (mChanged)
mOld.reset(mLands.getRecord(mId).clone().get());
} }
void CSMWorld::TouchLandCommand::onUndo() void CSMWorld::TouchLandCommand::onUndo()