mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 21:32:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'playerscale' into 'master'

Browse Source 
Fully reset the player's cell reference when the player is reset (#8021)

Closes #8021

See merge request OpenMW/openmw!4167
This commit is contained in:
psi29a 2024-06-15 12:04:01 +00:00
commit cb14af943d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -181,6 +181,7 @@
Bug #7997: Can toggle perspective when paralyzed Bug #7997: Can toggle perspective when paralyzed
Bug #8002: Portable light sources held by creatures do not emit lighting Bug #8002: Portable light sources held by creatures do not emit lighting
Bug #8018: Potion effects should never explode and always apply on self Bug #8018: Potion effects should never explode and always apply on self
Bug #8021: Player's scale doesn't reset when starting a new game
Feature #1415: Infinite fall failsafe Feature #1415: Infinite fall failsafe
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/openmw/mwworld/player.cpp
View File

@ -242,6 +242,11 @@ namespace MWWorld
void Player::clear() void Player::clear()
{ {
ESM::CellRef cellRef;
cellRef.blank();
cellRef.mRefID = ESM::RefId::stringRefId("Player");
cellRef.mRefNum = mPlayer.mRef.getRefNum();
mPlayer = LiveCellRef<ESM::NPC>(cellRef, mPlayer.mBase);
mCellStore = nullptr; mCellStore = nullptr;
mSign = ESM::RefId(); mSign = ESM::RefId();
mMarkedCell = nullptr; mMarkedCell = nullptr;

2
apps/openmw/mwworld/worldimp.cpp
View File

@ -426,8 +426,6 @@ namespace MWWorld
if (mPlayer) if (mPlayer)
{ {
mPlayer->clear(); mPlayer->clear();
mPlayer->setCell(nullptr);
mPlayer->getPlayer().getRefData() = RefData();
mPlayer->set(mStore.get<ESM::NPC>().find(ESM::RefId::stringRefId("Player"))); mPlayer->set(mStore.get<ESM::NPC>().find(ESM::RefId::stringRefId("Player")));
} }