teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] Make PlayerShapeshift turn DedicatedPlayers into creatures

Browse source
This commit is contained in:
David Cernat 2018-04-09 15:23:05 +03:00
parent 141eb8b7c2
commit c132dc70d2
2 changed files with 68 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
apps/openmw/mwmp/DedicatedPlayer.cpp
View file

@ -134,45 +134,55 @@ void DedicatedPlayer::setBaseInfo()
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
ESM::Creature tempCreature; if (reference)
ESM::NPC tempNpc;
if (!creatureRefId.empty())
{ {
const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId); deleteReference();
if (tmpCreature == 0)
{
creatureRefId = "";
}
else
{
tempCreature = getCreatureRecord();
}
} }
if (creatureRefId.empty()) std::string recId = getNpcRecordId();
{ createReference(recId);
tempNpc = getNpcRecord();
} // Give this new character a temporary high fatigue of at least 1 so it doesn't
// spawn on the ground
creatureStats.mDynamic[2].mBase = 1000;
}
void DedicatedPlayer::setShapeshift()
{
MWBase::World *world = MWBase::Environment::get().getWorld();
if (reference) if (reference)
{ {
deleteReference(); deleteReference();
} }
createReference(tempNpc, tempCreature); std::string recId;
// Give this new character a temporary high fatigue of at least 1 so it doesn't if (!creatureRefId.empty())
// spawn on the ground {
creatureStats.mDynamic[2].mBase = 1000; const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId);
if (tmpCreature != 0)
{
recId = getCreatureRecordId();
}
}
world->enable(ptr); if (recId.empty())
} {
recId = getNpcRecordId();
}
void DedicatedPlayer::setShapeshift() createReference(recId);
{
if (ptr.getTypeName() == typeid(ESM::NPC).name())
{
MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, isWerewolf);
if (!isWerewolf)
setEquipment();
}
MWBase::Environment::get().getWorld()->scaleObject(ptr, scale); MWBase::Environment::get().getWorld()->scaleObject(ptr, scale);
MWBase::Environment::get().getMechanicsManager()->setWerewolf(ptr, isWerewolf);
} }
void DedicatedPlayer::setAnimFlags() void DedicatedPlayer::setAnimFlags()
@ -340,25 +350,7 @@ void DedicatedPlayer::playSpeech()
winMgr->messageBox(MWBase::Environment::get().getDialogueManager()->getVoiceCaption(sound), MWGui::ShowInDialogueMode_Never); winMgr->messageBox(MWBase::Environment::get().getDialogueManager()->getVoiceCaption(sound), MWGui::ShowInDialogueMode_Never);
} }
std::string DedicatedPlayer::getNpcRecordId()
ESM::Creature DedicatedPlayer::getCreatureRecord()
{
MWBase::World *world = MWBase::Environment::get().getWorld();
ESM::Creature creature;
const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId);
creature = *tmpCreature;
creature.mScript = "";
if (!displayCreatureName)
creature.mName = npc.mName;
LOG_APPEND(Log::LOG_INFO, "Player %s looks like %s", npc.mName.c_str(), creatureRefId.c_str());
return creature;
}
ESM::NPC DedicatedPlayer::getNpcRecord()
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
@ -377,30 +369,42 @@ ESM::NPC DedicatedPlayer::getNpcRecord()
newNpc.mName = npc.mName; newNpc.mName = npc.mName;
newNpc.mFlags = npc.mFlags; newNpc.mFlags = npc.mFlags;
return newNpc; LOG_APPEND(Log::LOG_INFO, "- Creating new NPC record");
newNpc.mId = "Dedicated Player";
std::string recId = world->createRecord(newNpc)->mId;
return recId;
} }
void DedicatedPlayer::createReference(ESM::NPC& npc, ESM::Creature& creature) std::string DedicatedPlayer::getCreatureRecordId()
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
string recId; ESM::Creature creature;
if (creatureRefId.empty())
{ const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(creatureRefId);
LOG_APPEND(Log::LOG_INFO, "- Creating new NPC record");
npc.mId = "Dedicated Player"; creature = *tmpCreature;
recId = world->createRecord(npc)->mId; creature.mScript = "";
} if (!displayCreatureName)
else creature.mName = npc.mName;
{ LOG_APPEND(Log::LOG_INFO, "Player %s looks like %s", npc.mName.c_str(), creatureRefId.c_str());
LOG_APPEND(Log::LOG_INFO, "- Creating new Creature record");
creature.mId = "Dedicated Player"; LOG_APPEND(Log::LOG_INFO, "- Creating new NPC record");
recId = world->createRecord(creature)->mId; creature.mId = "Dedicated Player";
}
std::string recId = world->createRecord(creature)->mId;
return recId;
}
void DedicatedPlayer::createReference(const std::string& recId)
{
MWBase::World *world = MWBase::Environment::get().getWorld();
reference = new MWWorld::ManualRef(world->getStore(), recId, 1); reference = new MWWorld::ManualRef(world->getStore(), recId, 1);
LOG_APPEND(Log::LOG_INFO, "- Creating new reference pointer for %s", this->npc.mName.c_str()); LOG_APPEND(Log::LOG_INFO, "- Creating new reference pointer for %s", npc.mName.c_str());
ptr = world->placeObject(reference->getPtr(), Main::get().getCellController()->getCellStore(cell), position); ptr = world->placeObject(reference->getPtr(), Main::get().getCellController()->getCellStore(cell), position);

6
apps/openmw/mwmp/DedicatedPlayer.hpp
View file

@ -50,10 +50,10 @@ namespace mwmp
void playAnimation(); void playAnimation();
void playSpeech(); void playSpeech();
ESM::NPC getNpcRecord(); std::string getNpcRecordId();
ESM::Creature getCreatureRecord(); std::string getCreatureRecordId();
void createReference(ESM::NPC& npc, ESM::Creature& creature); void createReference(const std::string& recId);
void deleteReference(); void deleteReference();
MWWorld::Ptr getPtr(); MWWorld::Ptr getPtr();