mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

[General] Include AI services for creatures/NPCs in RecordDynamic

Browse source
This commit is contained in:
David Cernat 2019-08-07 10:44:07 +03:00
parent 18e2a14645
commit ef432d1419
5 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1206,6 +1206,23 @@ void RecordsDynamicFunctions::SetRecordAIFight(int aiFight) noexcept
tempOverrides.hasAiFight = true;
}
void RecordsDynamicFunctions::SetRecordAIServices(int aiServices) noexcept
{
unsigned short writeRecordsType = WorldstateFunctions::writeWorldstate.recordsType;
if (writeRecordsType == mwmp::RECORD_TYPE::CREATURE)
tempCreature.data.mAiData.mServices = aiServices;
else if (writeRecordsType == mwmp::RECORD_TYPE::NPC)
tempNpc.data.mAiData.mServices = aiServices;
else
{
LOG_MESSAGE_SIMPLE(Log::LOG_ERROR, "Tried to set AI services for record type %i which lacks that property", writeRecordsType);
return;
}
tempOverrides.hasAiServices = true;
}
void RecordsDynamicFunctions::SetRecordOpenSound(const char* sound) noexcept
{
unsigned short writeRecordsType = WorldstateFunctions::writeWorldstate.recordsType;

11
apps/openmw-mp/Script/Functions/RecordsDynamic.hpp
View file

@ -84,7 +84,9 @@
{"SetRecordLevel", RecordsDynamicFunctions::SetRecordLevel},\
{"SetRecordMagicka", RecordsDynamicFunctions::SetRecordMagicka},\
{"SetRecordFatigue", RecordsDynamicFunctions::SetRecordFatigue},\
\
{"SetRecordAIFight", RecordsDynamicFunctions::SetRecordAIFight},\
{"SetRecordAIServices", RecordsDynamicFunctions::SetRecordAIServices},\
\
{"SetRecordOpenSound", RecordsDynamicFunctions::SetRecordOpenSound},\
{"SetRecordCloseSound", RecordsDynamicFunctions::SetRecordCloseSound},\
@ -735,6 +737,15 @@ public:
*/
static void SetRecordAIFight(int aiFight) noexcept;
/**
* \brief Set the AI services value of the temporary record stored on the server for the
* currently specified record type.
*
* \param aiServices The AI services value of the record.
* \return void
*/
static void SetRecordAIServices(int aiServices) noexcept;
/**
* \brief Set the opening sound of the temporary record stored on the server for the
* currently specified record type.

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

@ -214,6 +214,9 @@ void RecordHelper::overrideCreatureRecord(const mwmp::CreatureRecord& record)
if (record.baseOverrides.hasAiFight)
finalData.mAiData.mFight = recordData.mAiData.mFight;
if (record.baseOverrides.hasAiServices)
finalData.mAiData.mServices = recordData.mAiData.mServices;
if (record.baseOverrides.hasFlags)
finalData.mFlags = recordData.mFlags;
@ -320,6 +323,9 @@ void RecordHelper::overrideNpcRecord(const mwmp::NpcRecord& record)
if (record.baseOverrides.hasAiFight)
finalData.mAiData.mFight = recordData.mAiData.mFight;
if (record.baseOverrides.hasAiServices)
finalData.mAiData.mServices = recordData.mAiData.mServices;
if (record.baseOverrides.hasFlags)
finalData.mFlags = recordData.mFlags;

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

@ -110,7 +110,9 @@ namespace mwmp
bool hasLevel = false;
bool hasMagicka = false;
bool hasFatigue = false;
bool hasAiFight = false;
bool hasAiServices = false;
bool hasOpenSound = false;
bool hasCloseSound = false;

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

@ -216,6 +216,7 @@ void PacketRecordDynamic::Packet(RakNet::BitStream *bs, bool send)
RW(recordData.mData.mMana, send);
RW(recordData.mData.mFatigue, send);
RW(recordData.mAiData.mFight, send);
RW(recordData.mAiData.mServices, send);
RW(recordData.mFlags, send);
RW(recordData.mScript, send, true);
ProcessInventoryList(record.inventory, recordData.mInventory, send);
@ -231,6 +232,7 @@ void PacketRecordDynamic::Packet(RakNet::BitStream *bs, bool send)
RW(overrides.hasMagicka, send);
RW(overrides.hasFatigue, send);
RW(overrides.hasAiFight, send);
RW(overrides.hasAiServices, send);
RW(overrides.hasFlags, send);
RW(overrides.hasScript, send);
RW(overrides.hasInventory, send);
@ -260,6 +262,8 @@ void PacketRecordDynamic::Packet(RakNet::BitStream *bs, bool send)
RW(recordData.mNpdt.mMana, send);
RW(recordData.mNpdt.mFatigue, send);
RW(recordData.mAiData.mFight, send);
RW(recordData.mAiData.mServices, send);
RW(recordData.mNpdtType, send);
ProcessInventoryList(record.inventory, recordData.mInventory, send);
@ -279,6 +283,7 @@ void PacketRecordDynamic::Packet(RakNet::BitStream *bs, bool send)
RW(overrides.hasMagicka, send);
RW(overrides.hasFatigue, send);
RW(overrides.hasAiFight, send);
RW(overrides.hasAiServices, send);
RW(overrides.hasAutoCalc, send);
RW(overrides.hasInventory, send);
}