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

[General] Add hasRace to record overrides in RecordsDynamic packet

Browse source
This commit is contained in:
David Cernat 2019-11-29 13:28:07 +02:00
parent ddb25a482d
commit b3747839c0
4 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw-mp/Script/Functions/RecordsDynamic.cpp
View file

@ -1188,6 +1188,8 @@ void RecordsDynamicFunctions::SetRecordRace(const char* race) noexcept
tempNpc.data.mRace = race; tempNpc.data.mRace = race;
else else
LOG_MESSAGE_SIMPLE(TimedLog::LOG_ERROR, "Tried to set race for record type %i which lacks that property", writeRecordsType); LOG_MESSAGE_SIMPLE(TimedLog::LOG_ERROR, "Tried to set race for record type %i which lacks that property", writeRecordsType);
tempOverrides.hasRace = true;
} }
void RecordsDynamicFunctions::SetRecordClass(const char* charClass) noexcept void RecordsDynamicFunctions::SetRecordClass(const char* charClass) noexcept

2
apps/openmw/mwmp/RecordHelper.cpp
View file

@ -939,7 +939,7 @@ void RecordHelper::overrideRecord(const mwmp::NpcRecord& record)
else else
finalData.setIsMale(baseData->isMale()); finalData.setIsMale(baseData->isMale());
if (!record.data.mRace.empty()) if (record.baseOverrides.hasRace)
finalData.mRace = recordData.mRace; finalData.mRace = recordData.mRace;
if (record.baseOverrides.hasModel) if (record.baseOverrides.hasModel)

1
components/openmw-mp/Base/BaseWorldstate.hpp
View file

@ -113,6 +113,7 @@ namespace mwmp
bool hasHair = false; bool hasHair = false;
bool hasHead = false; bool hasHead = false;
bool hasGender = false; bool hasGender = false;
bool hasRace = false;
bool hasFaction = false; bool hasFaction = false;
bool hasScale = false; bool hasScale = false;

1
components/openmw-mp/Packets/Worldstate/PacketRecordDynamic.cpp
View file

@ -296,6 +296,7 @@ void PacketRecordDynamic::Packet(RakNet::BitStream *bs, bool send)
RW(overrides.hasGender, send); RW(overrides.hasGender, send);
RW(overrides.hasFlags, send); RW(overrides.hasFlags, send);
RW(overrides.hasModel, send); RW(overrides.hasModel, send);
RW(overrides.hasRace, send);
RW(overrides.hasHair, send); RW(overrides.hasHair, send);
RW(overrides.hasHead, send); RW(overrides.hasHead, send);
RW(overrides.hasFaction, send); RW(overrides.hasFaction, send);