fix: a character's mount save is written as 0, as live did

All 450 live saves looked at had <mnt a="0"/>. The server wrote the item
of the mount being ridden, a value live never showed and the client
would start with although nobody rides after a load.

<mnt a="0"/> is now always written, riding or not. A save that holds
another value, or one that is not a number, is still read without
failing and gets 0 at the next save.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-11-10 16:13:42 -06:00
parent 76930028db
commit 1056ca0025
3 changed files with 23 additions and 17 deletions

View File

@@ -1,7 +1,5 @@
#include "MountControlComponent.h"
#include "Entity.h"
#include "PossessorComponent.h"
#include "tinyxml2.h"
@@ -18,6 +16,6 @@ void MountControlComponent::WriteSaveData(tinyxml2::XMLDocument& doc) {
auto* mount = obj->FirstChildElement("mnt");
if (!mount) mount = obj->InsertNewChildElement("mnt");
const auto* const possessor = m_Parent->GetComponent<PossessorComponent>();
mount->SetAttribute("a", possessor ? possessor->GetMountItemID() : LWOOBJID_EMPTY);
// 0 in every live save looked at (450), so 0 is written, riding or not
mount->SetAttribute("a", 0);
}

View File

@@ -7,8 +7,8 @@
/**
* Mount control (111): the character's riding of mounts, as the client's LWOMountControlComponent: the client makes it (componentID -1) with every character
* (LWOCharacterComponent::Factory). It keeps the mount item in the character's save, as live did (<mnt a="item id"/>,
* 0 when not riding: all 450 live saves looked at were 0).
* (LWOCharacterComponent::Factory). It writes the mount element of the character's save as live did: <mnt a="0"/> in
* all 450 live saves looked at, so always 0.
*/
class MountControlComponent final : public Component {
public:
@@ -19,10 +19,10 @@ public:
// LWOMountControlComponent::LoadFromSaveData (0x00bf99c0): <mnt a>, the mount item of the save
void LoadFromSaveData(const tinyxml2::XMLDocument& doc) override;
// Writes <mnt a>: the item of the mount being ridden (PossessorComponent's), 0 when on foot
// Writes <mnt a="0"/>, as live did, also while a mount is ridden
void WriteSaveData(tinyxml2::XMLDocument& doc) override;
// The mount item the save named. Riding does not go on over a world change, so nothing is mounted from it.
// The mount item the save named (a save may hold one that is not 0). Nothing is mounted from it.
LWOOBJID GetSavedMountItemID() const { return m_SavedMountItemID; }
private:

View File

@@ -1,5 +1,5 @@
// The mount item in a character's save: LWOMountControlComponent::LoadFromSaveData (0x00bf99c0) reads <mnt a>, and
// every live save had the element (<mnt a="0"/> on the 450 looked at).
// The mount element of a character's save: LWOMountControlComponent::LoadFromSaveData (0x00bf99c0) reads <mnt a>, and
// every live save had the element, always as <mnt a="0"/> (450 looked at).
#include "GameDependencies.h"
#include "Entity.h"
@@ -38,8 +38,9 @@ TEST_F(MountControlComponentTests, OldSaveGainsTheElement) {
EXPECT_EQ(Print(doc), R"(<obj v="1"><mf hc="1"/><char cc="5"/><dest hm="4"/><mnt a="0"/></obj>)");
}
// The item of the mount being ridden is saved, in the element's own place; on foot it is 0 again
TEST_F(MountControlComponentTests, TheRiddenMountIsSaved) {
// Live wrote 0 in every save, so 0 is written while a mount is ridden as well. A save that holds another value is
// read without failing and gets 0 at the next save.
TEST_F(MountControlComponentTests, ZeroIsWrittenAlsoWhileRiding) {
tinyxml2::XMLDocument doc;
ASSERT_EQ(doc.Parse(R"(<obj v="1"><mis/><mnt a="1152921510436607007"/><dest hm="4"/></obj>)"), tinyxml2::XML_SUCCESS);
Entity player(71, info);
@@ -48,15 +49,22 @@ TEST_F(MountControlComponentTests, TheRiddenMountIsSaved) {
mountControl->LoadFromSaveData(doc);
EXPECT_EQ(mountControl->GetSavedMountItemID(), 1152921510436607007LL);
// Nothing is ridden after a load
mountControl->WriteSaveData(doc);
EXPECT_EQ(Print(doc), R"(<obj v="1"><mis/><mnt a="0"/><dest hm="4"/></obj>)");
possessor->SetMountItemID(1152921510436607123LL);
mountControl->WriteSaveData(doc);
EXPECT_EQ(Print(doc), R"(<obj v="1"><mis/><mnt a="1152921510436607123"/><dest hm="4"/></obj>)");
possessor->SetMountItemID(LWOOBJID_EMPTY);
mountControl->WriteSaveData(doc);
EXPECT_EQ(Print(doc), R"(<obj v="1"><mis/><mnt a="0"/><dest hm="4"/></obj>)");
}
// An a that is not a number is not an error: nothing is read and 0 is written
TEST_F(MountControlComponentTests, AnUnreadableValueDoesNotFail) {
tinyxml2::XMLDocument doc;
ASSERT_EQ(doc.Parse(R"(<obj v="1"><mnt a="x"/></obj>)"), tinyxml2::XML_SUCCESS);
Entity player(72, info);
auto* const mountControl = player.AddComponent<MountControlComponent>(-1);
mountControl->LoadFromSaveData(doc);
EXPECT_EQ(mountControl->GetSavedMountItemID(), LWOOBJID_EMPTY);
mountControl->WriteSaveData(doc);
EXPECT_EQ(Print(doc), R"(<obj v="1"><mnt a="0"/></obj>)");
}