mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-03-31 13:06:42 +00:00
[Client] Reorder DedicatedPlayer's functions
This commit is contained in:
David Cernat
parent
676481d061
commit
1083fa5196
2 changed files with 113 additions and 113 deletions
|
|
@ -188,73 +188,6 @@ void DedicatedPlayer::setStatsDynamic()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DedicatedPlayer::setShapeshift()
|
|
||||||
{
|
|
||||||
MWBase::World *world = MWBase::Environment::get().getWorld();
|
|
||||||
|
|
||||||
bool isNpc = false;
|
|
||||||
|
|
||||||
if (reference)
|
|
||||||
isNpc = ptr.getTypeName() == typeid(ESM::NPC).name();
|
|
||||||
|
|
||||||
if (creatureRefId != previousCreatureRefId || displayCreatureName != previousDisplayCreatureName)
|
|
||||||
{
|
|
||||||
if (!creatureRefId.empty() && RecordHelper::doesRecordIdExist<ESM::Creature>(creatureRefId))
|
|
||||||
{
|
|
||||||
deleteReference();
|
|
||||||
|
|
||||||
const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId);
|
|
||||||
creature = *tmpCreature;
|
|
||||||
creature.mScript = "";
|
|
||||||
if (!displayCreatureName)
|
|
||||||
creature.mName = npc.mName;
|
|
||||||
LOG_APPEND(TimedLog::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
|
|
||||||
// and reuse it
|
|
||||||
if (creatureRecordId.empty())
|
|
||||||
{
|
|
||||||
creature.mId = creatureRecordId = RecordHelper::createRecord(creature)->mId;
|
|
||||||
LOG_APPEND(TimedLog::LOG_INFO, "- Creating new creature record %s", creatureRecordId.c_str());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
creature.mId = creatureRecordId;
|
|
||||||
RecordHelper::overrideRecord(creature);
|
|
||||||
}
|
|
||||||
|
|
||||||
LOG_APPEND(TimedLog::LOG_INFO, "- Creating reference for %s", creature.mId.c_str());
|
|
||||||
createReference(creature.mId);
|
|
||||||
}
|
|
||||||
// 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::overrideRecord(npc);
|
|
||||||
createReference(npc.mId);
|
|
||||||
reloadPtr();
|
|
||||||
}
|
|
||||||
|
|
||||||
previousCreatureRefId = creatureRefId;
|
|
||||||
previousDisplayCreatureName = displayCreatureName;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ptr.getTypeName() == typeid(ESM::NPC).name())
|
|
||||||
{
|
|
||||||
MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, isWerewolf);
|
|
||||||
|
|
||||||
if (!isWerewolf)
|
|
||||||
setEquipment();
|
|
||||||
}
|
|
||||||
|
|
||||||
MWBase::Environment::get().getWorld()->scaleObject(ptr, scale);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DedicatedPlayer::setAnimFlags()
|
void DedicatedPlayer::setAnimFlags()
|
||||||
{
|
{
|
||||||
using namespace MWMechanics;
|
using namespace MWMechanics;
|
||||||
|
|
@ -374,6 +307,73 @@ void DedicatedPlayer::setEquipment()
|
||||||
hasReceivedInitialEquipment = true;
|
hasReceivedInitialEquipment = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DedicatedPlayer::setShapeshift()
|
||||||
|
{
|
||||||
|
MWBase::World* world = MWBase::Environment::get().getWorld();
|
||||||
|
|
||||||
|
bool isNpc = false;
|
||||||
|
|
||||||
|
if (reference)
|
||||||
|
isNpc = ptr.getTypeName() == typeid(ESM::NPC).name();
|
||||||
|
|
||||||
|
if (creatureRefId != previousCreatureRefId || displayCreatureName != previousDisplayCreatureName)
|
||||||
|
{
|
||||||
|
if (!creatureRefId.empty() && RecordHelper::doesRecordIdExist<ESM::Creature>(creatureRefId))
|
||||||
|
{
|
||||||
|
deleteReference();
|
||||||
|
|
||||||
|
const ESM::Creature* tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId);
|
||||||
|
creature = *tmpCreature;
|
||||||
|
creature.mScript = "";
|
||||||
|
if (!displayCreatureName)
|
||||||
|
creature.mName = npc.mName;
|
||||||
|
LOG_APPEND(TimedLog::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
|
||||||
|
// and reuse it
|
||||||
|
if (creatureRecordId.empty())
|
||||||
|
{
|
||||||
|
creature.mId = creatureRecordId = RecordHelper::createRecord(creature)->mId;
|
||||||
|
LOG_APPEND(TimedLog::LOG_INFO, "- Creating new creature record %s", creatureRecordId.c_str());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
creature.mId = creatureRecordId;
|
||||||
|
RecordHelper::overrideRecord(creature);
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG_APPEND(TimedLog::LOG_INFO, "- Creating reference for %s", creature.mId.c_str());
|
||||||
|
createReference(creature.mId);
|
||||||
|
}
|
||||||
|
// 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::overrideRecord(npc);
|
||||||
|
createReference(npc.mId);
|
||||||
|
reloadPtr();
|
||||||
|
}
|
||||||
|
|
||||||
|
previousCreatureRefId = creatureRefId;
|
||||||
|
previousDisplayCreatureName = displayCreatureName;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ptr.getTypeName() == typeid(ESM::NPC).name())
|
||||||
|
{
|
||||||
|
MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, isWerewolf);
|
||||||
|
|
||||||
|
if (!isWerewolf)
|
||||||
|
setEquipment();
|
||||||
|
}
|
||||||
|
|
||||||
|
MWBase::Environment::get().getWorld()->scaleObject(ptr, scale);
|
||||||
|
}
|
||||||
|
|
||||||
void DedicatedPlayer::setCell()
|
void DedicatedPlayer::setCell()
|
||||||
{
|
{
|
||||||
// Prevent cell update when reference doesn't exist
|
// Prevent cell update when reference doesn't exist
|
||||||
|
|
@ -431,6 +431,34 @@ void DedicatedPlayer::setCell()
|
||||||
hasFinishedInitialTeleportation = true;
|
hasFinishedInitialTeleportation = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DedicatedPlayer::playAnimation()
|
||||||
|
{
|
||||||
|
MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(getPtr(),
|
||||||
|
animation.groupname, animation.mode, animation.count, animation.persist);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DedicatedPlayer::playSpeech()
|
||||||
|
{
|
||||||
|
MWBase::Environment::get().getSoundManager()->say(getPtr(), sound);
|
||||||
|
|
||||||
|
MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
|
||||||
|
if (winMgr->getSubtitlesEnabled())
|
||||||
|
winMgr->messageBox(MWBase::Environment::get().getDialogueManager()->getVoiceCaption(sound), MWGui::ShowInDialogueMode_Never);
|
||||||
|
}
|
||||||
|
|
||||||
|
void DedicatedPlayer::equipItem(std::string itemId, bool noSound)
|
||||||
|
{
|
||||||
|
for (const auto& itemPtr : ptr.getClass().getInventoryStore(ptr))
|
||||||
|
{
|
||||||
|
if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), itemId))
|
||||||
|
{
|
||||||
|
std::shared_ptr<MWWorld::Action> action = itemPtr.getClass().use(itemPtr);
|
||||||
|
action->execute(ptr, noSound);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void DedicatedPlayer::updateMarker()
|
void DedicatedPlayer::updateMarker()
|
||||||
{
|
{
|
||||||
if (!markerEnabled)
|
if (!markerEnabled)
|
||||||
|
|
@ -472,34 +500,6 @@ void DedicatedPlayer::removeMarker()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DedicatedPlayer::playAnimation()
|
|
||||||
{
|
|
||||||
MWBase::Environment::get().getMechanicsManager()->playAnimationGroup(getPtr(),
|
|
||||||
animation.groupname, animation.mode, animation.count, animation.persist);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DedicatedPlayer::playSpeech()
|
|
||||||
{
|
|
||||||
MWBase::Environment::get().getSoundManager()->say(getPtr(), sound);
|
|
||||||
|
|
||||||
MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
|
|
||||||
if (winMgr->getSubtitlesEnabled())
|
|
||||||
winMgr->messageBox(MWBase::Environment::get().getDialogueManager()->getVoiceCaption(sound), MWGui::ShowInDialogueMode_Never);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DedicatedPlayer::equipItem(std::string itemId, bool noSound)
|
|
||||||
{
|
|
||||||
for (const auto& itemPtr : ptr.getClass().getInventoryStore(ptr))
|
|
||||||
{
|
|
||||||
if (::Misc::StringUtils::ciEqual(itemPtr.getCellRef().getRefId(), itemId))
|
|
||||||
{
|
|
||||||
std::shared_ptr<MWWorld::Action> action = itemPtr.getClass().use(itemPtr);
|
|
||||||
action->execute(ptr, noSound);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void DedicatedPlayer::createReference(const std::string& recId)
|
void DedicatedPlayer::createReference(const std::string& recId)
|
||||||
{
|
{
|
||||||
MWBase::World *world = MWBase::Environment::get().getWorld();
|
MWBase::World *world = MWBase::Environment::get().getWorld();
|
||||||
|
|
|
||||||
|
|
@ -35,22 +35,22 @@ namespace mwmp
|
||||||
void move(float dt);
|
void move(float dt);
|
||||||
void setBaseInfo();
|
void setBaseInfo();
|
||||||
void setStatsDynamic();
|
void setStatsDynamic();
|
||||||
void setShapeshift();
|
|
||||||
void setAnimFlags();
|
void setAnimFlags();
|
||||||
void setAttributes();
|
void setAttributes();
|
||||||
void setSkills();
|
void setSkills();
|
||||||
void setEquipment();
|
void setEquipment();
|
||||||
|
void setShapeshift();
|
||||||
void setCell();
|
void setCell();
|
||||||
|
|
||||||
void updateMarker();
|
|
||||||
void removeMarker();
|
|
||||||
void enableMarker();
|
|
||||||
|
|
||||||
void playAnimation();
|
void playAnimation();
|
||||||
void playSpeech();
|
void playSpeech();
|
||||||
|
|
||||||
void equipItem(std::string itemId, bool noSound = false);
|
void equipItem(std::string itemId, bool noSound = false);
|
||||||
|
|
||||||
|
void updateMarker();
|
||||||
|
void removeMarker();
|
||||||
|
void enableMarker();
|
||||||
|
|
||||||
void createReference(const std::string& recId);
|
void createReference(const std::string& recId);
|
||||||
void deleteReference();
|
void deleteReference();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue