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

[Client] Fix issues when changing npc model to creature

Browse source
This commit is contained in:
Koncord 2017-05-01 22:54:43 +08:00
parent 6ddab0d323
commit 60f4a1d9e5
2 changed files with 74 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,6 +41,7 @@ using namespace std;
DedicatedPlayer::DedicatedPlayer(RakNet::RakNetGUID guid) : BasePlayer(guid) DedicatedPlayer::DedicatedPlayer(RakNet::RakNetGUID guid) : BasePlayer(guid)
{ {
reference = 0;
attack.pressed = 0; attack.pressed = 0;
creatureStats.mDead = false; creatureStats.mDead = false;
movementFlags = 0; movementFlags = 0;

97
apps/openmw/mwmp/PlayerList.cpp
View file

@ -1,4 +1,5 @@
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include <apps/openmw/mwclass/creature.hpp>
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
@ -20,7 +21,7 @@
using namespace mwmp; using namespace mwmp;
using namespace std; using namespace std;
std::map<RakNet::RakNetGUID, DedicatedPlayer *> PlayerList::players; std::map <RakNet::RakNetGUID, DedicatedPlayer *> PlayerList::players;
void PlayerList::update(float dt) void PlayerList::update(float dt)
{ {
@ -46,7 +47,7 @@ void PlayerList::createPlayer(RakNet::RakNetGUID guid)
if (!dedicPlayer->creatureModel.empty()) if (!dedicPlayer->creatureModel.empty())
{ {
const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(dedicPlayer->creatureModel); const ESM::Creature *tmpCreature = world->getStore().get<ESM::Creature>().search(dedicPlayer->creatureModel);
if(tmpCreature == 0) if (tmpCreature == 0)
{ {
dedicPlayer->creatureModel = ""; dedicPlayer->creatureModel = "";
createPlayer(guid); createPlayer(guid);
@ -54,8 +55,10 @@ void PlayerList::createPlayer(RakNet::RakNetGUID guid)
} }
creature = *tmpCreature; creature = *tmpCreature;
creature.mScript = ""; creature.mScript = "";
if(!dedicPlayer->useCreatureName) if (!dedicPlayer->useCreatureName)
creature.mName = dedicPlayer->npc.mName; creature.mName = dedicPlayer->npc.mName;
LOG_APPEND(Log::LOG_INFO, "Player %s looks like %s", dedicPlayer->npc.mName.c_str(),
dedicPlayer->creatureModel.c_str());
} }
else else
{ {
@ -75,21 +78,23 @@ void PlayerList::createPlayer(RakNet::RakNetGUID guid)
npc.mFlags = dedicPlayer->npc.mFlags; npc.mFlags = dedicPlayer->npc.mFlags;
} }
if (dedicPlayer->state == 0) bool reset = false;
if (dedicPlayer->reference)
{ {
string recid; bool isNPC = dedicPlayer->reference->getPtr().getTypeName() == typeid(ESM::NPC).name();
if (dedicPlayer->creatureModel.empty()) if ((!dedicPlayer->creatureModel.empty() && isNPC) ||
(dedicPlayer->creatureModel.empty() && !isNPC))
{ {
npc.mId = "Dedicated Player"; if (dedicPlayer->reference)
recid = world->createRecord(npc)->mId; {
LOG_APPEND(Log::LOG_INFO, "- Deleting old reference");
dedicPlayer->state = 0;
world->deleteObject(dedicPlayer->ptr);
delete dedicPlayer->reference;
dedicPlayer->reference = NULL;
reset = true;
}
} }
else
{
creature.mId = "Dedicated Player";
recid = world->createRecord(creature)->mId;
}
dedicPlayer->reference = new MWWorld::ManualRef(world->getStore(), recid, 1);
} }
// Temporarily spawn or move player to the center of exterior 0,0 whenever setting base info // Temporarily spawn or move player to the center of exterior 0,0 whenever setting base info
@ -100,39 +105,83 @@ void PlayerList::createPlayer(RakNet::RakNetGUID guid)
if (dedicPlayer->state == 0) if (dedicPlayer->state == 0)
{ {
string recid;
if (dedicPlayer->creatureModel.empty())
{
LOG_APPEND(Log::LOG_INFO, "- Creating new NPC record");
npc.mId = "Dedicated Player";
recid = world->createRecord(npc)->mId;
}
else
{
LOG_APPEND(Log::LOG_INFO, "- Creating new Creature record");
creature.mId = "Dedicated Player";
recid = world->createRecord(creature)->mId;
}
dedicPlayer->reference = new MWWorld::ManualRef(world->getStore(), recid, 1);
LOG_APPEND(Log::LOG_INFO, "- Creating new reference pointer for %s", dedicPlayer->npc.mName.c_str()); LOG_APPEND(Log::LOG_INFO, "- Creating new reference pointer for %s", dedicPlayer->npc.mName.c_str());
MWWorld::Ptr tmp = world->placeObject(dedicPlayer->reference->getPtr(), cellStore, spawnPos); MWWorld::Ptr tmp;
if (reset)
{
if (dedicPlayer->cell.isExterior())
cellStore = world->getExterior(dedicPlayer->cell.mData.mX, dedicPlayer->cell.mData.mY);
else
cellStore = world->getInterior(dedicPlayer->cell.mName);
spawnPos = dedicPlayer->position;
}
tmp = world->placeObject(dedicPlayer->reference->getPtr(), cellStore, spawnPos);
dedicPlayer->ptr.mCell = tmp.mCell; dedicPlayer->ptr.mCell = tmp.mCell;
dedicPlayer->ptr.mRef = tmp.mRef; dedicPlayer->ptr.mRef = tmp.mRef;
dedicPlayer->cell = *dedicPlayer->ptr.getCell()->getCell(); if (!reset)
dedicPlayer->position = dedicPlayer->ptr.getRefData().getPosition(); {
dedicPlayer->cell = *dedicPlayer->ptr.getCell()->getCell();
dedicPlayer->position = dedicPlayer->ptr.getRefData().getPosition();
}
} }
else else
{ {
LOG_APPEND(Log::LOG_INFO, "- Updating reference pointer for %s", dedicPlayer->npc.mName.c_str()); LOG_APPEND(Log::LOG_INFO, "- Updating reference pointer for %s", dedicPlayer->npc.mName.c_str());
MWWorld::ESMStore *store = const_cast<MWWorld::ESMStore *>(&world->getStore()); MWWorld::ESMStore *store = const_cast<MWWorld::ESMStore *>(&world->getStore());
MWWorld::Store<ESM::Creature> *creature_store = const_cast<MWWorld::Store<ESM::Creature> *> (&store->get<ESM::Creature>());
MWWorld::Store<ESM::NPC> *npc_store = const_cast<MWWorld::Store<ESM::NPC> *> (&store->get<ESM::NPC>());
if (!dedicPlayer->creatureModel.empty()) if (!dedicPlayer->creatureModel.empty())
{ {
creature.mId = players[guid]->ptr.get<ESM::Creature>()->mBase->mId; if (!npc.mId.empty() || npc.mId != "Dedicated Player")
MWWorld::Store<ESM::Creature> *esm_store = const_cast<MWWorld::Store<ESM::Creature> *> (&store->get<ESM::Creature>()); {
esm_store->insert(creature); LOG_APPEND(Log::LOG_INFO, "- Deleting NPC record");
npc_store->erase(npc.mId);
npc.mId.clear();
}
creature.mId = players[guid]->ptr.get<ESM::Creature>()->mBase->mId;
creature_store->insert(creature);
} }
else else
{ {
if (!creature.mId.empty() || creature.mId != "Dedicated Player")
{
LOG_APPEND(Log::LOG_INFO, "- Deleting Creature record");
creature_store->erase(creature.mId);
creature.mId.clear();
}
npc.mId = players[guid]->ptr.get<ESM::NPC>()->mBase->mId; npc.mId = players[guid]->ptr.get<ESM::NPC>()->mBase->mId;
MWWorld::Store<ESM::NPC> *esm_store = const_cast<MWWorld::Store<ESM::NPC> *> (&store->get<ESM::NPC>()); npc_store->insert(npc);
esm_store->insert(npc);
} }
// Disable Ptr to avoid graphical glitches caused by race changes // Disable Ptr to avoid graphical glitches caused by race changes
world->disable(players[guid]->ptr); world->disable(players[guid]->ptr);
dedicPlayer->setPtr(world->moveObject(dedicPlayer->ptr, cellStore, spawnPos.pos[0], spawnPos.pos[1], spawnPos.pos[2])); dedicPlayer->setPtr(world->moveObject(dedicPlayer->ptr, cellStore, spawnPos.pos[0], spawnPos.pos[1], spawnPos.pos[2]));
dedicPlayer->updateCell(); dedicPlayer->updateCell();