AnarchistGamers/TES3MP
1
0
Fork 0
mirror of https://github.com/TES3MP/TES3MP.git synced 2025-09-29 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

[Client] Track & use previous race & creatureRefId for DedicatedPlayers

Browse Source
This commit is contained in:
David Cernat 2018-04-13 16:16:43 +03:00
parent acb1335d78
commit 68ee64902d
2 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
apps/openmw/mwmp/DedicatedPlayer.cpp
View File

@ -60,6 +60,7 @@ DedicatedPlayer::DedicatedPlayer(RakNet::RakNetGUID guid) : BasePlayer(guid)
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
npc = *world->getPlayerPtr().get<ESM::NPC>()->mBase; npc = *world->getPlayerPtr().get<ESM::NPC>()->mBase;
npc.mId = "Dedicated Player"; npc.mId = "Dedicated Player";
previousRace = npc.mRace;
} }
DedicatedPlayer::~DedicatedPlayer() DedicatedPlayer::~DedicatedPlayer()
{ {
@ -142,8 +143,6 @@ void DedicatedPlayer::move(float dt)
void DedicatedPlayer::setBaseInfo() void DedicatedPlayer::setBaseInfo()
{ {
static std::string previousRace;
// Use the previous race if the new one doesn't exist // Use the previous race if the new one doesn't exist
if (!RecordHelper::doesRaceExist(npc.mRace)) if (!RecordHelper::doesRaceExist(npc.mRace))
npc.mRace = previousRace; npc.mRace = previousRace;
@ -175,56 +174,61 @@ void DedicatedPlayer::setShapeshift()
if (reference) if (reference)
isNpc = ptr.getTypeName() == typeid(ESM::NPC).name(); isNpc = ptr.getTypeName() == typeid(ESM::NPC).name();
if (!creatureRefId.empty() && RecordHelper::doesCreatureExist(creatureRefId)) if (creatureRefId != previousCreatureRefId)
{ {
if (isNpc) if (!creatureRefId.empty() && RecordHelper::doesCreatureExist(creatureRefId))
{ {
deleteReference(); if (isNpc)
} {
deleteReference();
}
const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId); const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId);
creature = *tmpCreature; creature = *tmpCreature;
creature.mScript = ""; creature.mScript = "";
if (!displayCreatureName) if (!displayCreatureName)
creature.mName = npc.mName; creature.mName = npc.mName;
LOG_APPEND(Log::LOG_INFO, "- %s is disguised as %s", npc.mName.c_str(), creatureRefId.c_str()); LOG_APPEND(Log::LOG_INFO, "- %s is disguised as %s", npc.mName.c_str(), creatureRefId.c_str());
// Is this our first time creating a creature record id for this player? If so, keep it around // Is this our first time creating a creature record id for this player? If so, keep it around
// and reuse it // and reuse it
if (creatureRecordId.empty()) if (creatureRecordId.empty())
{ {
creature.mId = "Dedicated Player"; creature.mId = "Dedicated Player";
creature.mId = creatureRecordId = RecordHelper::createCreatureRecord(creature); creature.mId = creatureRecordId = RecordHelper::createCreatureRecord(creature);
LOG_APPEND(Log::LOG_INFO, "- Creating new creature record %s", creatureRecordId.c_str()); LOG_APPEND(Log::LOG_INFO, "- Creating new creature record %s", creatureRecordId.c_str());
} }
else else
{ {
creature.mId = creatureRecordId; creature.mId = creatureRecordId;
RecordHelper::updateCreatureRecord(creature); RecordHelper::updateCreatureRecord(creature);
} }
if (!reference) if (!reference)
{ {
LOG_APPEND(Log::LOG_INFO, "- Creating reference for %s", creature.mId.c_str()); LOG_APPEND(Log::LOG_INFO, "- Creating reference for %s", creature.mId.c_str());
createReference(creature.mId); createReference(creature.mId);
}
else
{
reloadPtr();
}
} }
else // This player was already a creature, but the new creature refId was empty or
// invalid, so we'll turn this player into their NPC self again as a result
else if (!isNpc)
{ {
if (reference)
{
deleteReference();
}
RecordHelper::updateNpcRecord(npc);
createReference(npc.mId);
reloadPtr(); reloadPtr();
} }
}
// This player was already a creature, but the new creature refId was empty or
// invalid, so we'll turn this player into their NPC self again as a result
else if (!isNpc)
{
if (reference)
{
deleteReference();
}
RecordHelper::updateNpcRecord(npc); previousCreatureRefId = creatureRefId;
createReference(npc.mId);
reloadPtr();
} }
if (ptr.getTypeName() == typeid(ESM::NPC).name()) if (ptr.getTypeName() == typeid(ESM::NPC).name())

4
apps/openmw/mwmp/DedicatedPlayer.hpp
View File

@ -71,7 +71,9 @@ namespace mwmp
ESM::CustomMarker marker; ESM::CustomMarker marker;
bool markerEnabled; bool markerEnabled;
std::string npcRecordId; std::string previousRace;
std::string previousCreatureRefId;
std::string creatureRecordId; std::string creatureRecordId;
}; };
} }