mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

[Client] Reorder methods in DedicatedPlayer

Browse Source
pull/199/head
David Cernat 8 years ago
parent 0aaf68c994
commit 7c45888f05
2 changed files with 127 additions and 126 deletions
Show Stats Download Patch File Download Diff File

237
apps/openmw/mwmp/DedicatedPlayer.cpp
Unescape Escape View File

@ -52,9 +52,48 @@ DedicatedPlayer::~DedicatedPlayer()
}
MWWorld::Ptr DedicatedPlayer::getPtr()
void PlayerList::update(float dt)
{
return ptr;
for (std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin(); it != players.end(); it++)
{
DedicatedPlayer *pl = it->second;
if (pl == 0) continue;
MWMechanics::NpcStats *ptrNpcStats = &pl->ptr.getClass().getNpcStats(pl->getPtr());
MWMechanics::DynamicStat<float> value;
if (pl->creatureStats.mDead)
{
value.readState(pl->creatureStats.mDynamic[0]);
ptrNpcStats->setHealth(value);
continue;
}
value.readState(pl->creatureStats.mDynamic[0]);
ptrNpcStats->setHealth(value);
value.readState(pl->creatureStats.mDynamic[1]);
ptrNpcStats->setMagicka(value);
value.readState(pl->creatureStats.mDynamic[2]);
ptrNpcStats->setFatigue(value);
if (ptrNpcStats->isDead())
ptrNpcStats->resurrect();
ptrNpcStats->setAttacked(false);
ptrNpcStats->getAiSequence().stopCombat();
ptrNpcStats->setAlarmed(false);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Alarm, 0);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Fight, 0);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Flee, 0);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Hello, 0);
ptrNpcStats->setBaseDisposition(255);
pl->move(dt);
pl->updateAnimFlags();
}
}
void PlayerList::createPlayer(RakNet::RakNetGUID guid)
@ -136,11 +175,13 @@ void PlayerList::createPlayer(RakNet::RakNetGUID guid)
world->enable(players[guid]->ptr);
}
void PlayerList::cleanUp()
DedicatedPlayer *PlayerList::newPlayer(RakNet::RakNetGUID guid)
{
for (std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin(); it != players.end(); it++)
delete it->second;
LOG_APPEND(Log::LOG_INFO, "- Creating new DedicatedPlayer with guid %lu", guid.g);
players[guid] = new DedicatedPlayer(guid);
players[guid]->state = 0;
return players[guid];
}
void PlayerList::disconnectPlayer(RakNet::RakNetGUID guid)
@ -166,19 +207,30 @@ void PlayerList::disconnectPlayer(RakNet::RakNetGUID guid)
}
}
DedicatedPlayer *PlayerList::getPlayer(RakNet::RakNetGUID guid)
void PlayerList::cleanUp()
{
return players[guid];
for (std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin(); it != players.end(); it++)
delete it->second;
}
MWWorld::Ptr DedicatedPlayer::getLiveCellPtr()
DedicatedPlayer *PlayerList::getPlayer(RakNet::RakNetGUID guid)
{
return reference->getPtr();
return players[guid];
}
MWWorld::ManualRef *DedicatedPlayer::getRef()
DedicatedPlayer *PlayerList::getPlayer(const MWWorld::Ptr &ptr)
{
return reference;
std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin();
for (; it != players.end(); it++)
{
if (it->second == 0 || it->second->getPtr().mRef == 0)
continue;
string refid = ptr.getCellRef().getRefId();
if (it->second->getPtr().getCellRef().getRefId() == refid)
return it->second;
}
return 0;
}
void DedicatedPlayer::move(float dt)
@ -206,69 +258,38 @@ void DedicatedPlayer::move(float dt)
world->rotateObject(ptr, position.rot[0], position.rot[1], position.rot[2]);
}
void PlayerList::update(float dt)
void DedicatedPlayer::updateAnimFlags()
{
for (std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin(); it != players.end(); it++)
{
DedicatedPlayer *pl = it->second;
if (pl == 0) continue;
MWMechanics::NpcStats *ptrNpcStats = &pl->ptr.getClass().getNpcStats(pl->getPtr());
MWMechanics::DynamicStat<float> value;
if (pl->creatureStats.mDead)
{
value.readState(pl->creatureStats.mDynamic[0]);
ptrNpcStats->setHealth(value);
continue;
}
value.readState(pl->creatureStats.mDynamic[0]);
ptrNpcStats->setHealth(value);
value.readState(pl->creatureStats.mDynamic[1]);
ptrNpcStats->setMagicka(value);
value.readState(pl->creatureStats.mDynamic[2]);
ptrNpcStats->setFatigue(value);
if (ptrNpcStats->isDead())
ptrNpcStats->resurrect();
ptrNpcStats->setAttacked(false);
ptrNpcStats->getAiSequence().stopCombat();
using namespace MWMechanics;
ptrNpcStats->setAlarmed(false);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Alarm, 0);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Fight, 0);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Flee, 0);
ptrNpcStats->setAiSetting(MWMechanics::CreatureStats::AI_Hello, 0);
MWBase::World *world = MWBase::Environment::get().getWorld();
ptrNpcStats->setBaseDisposition(255);
pl->move(dt);
pl->updateAnimFlags();
// Until we figure out a better workaround for disabling player gravity,
// simply cast Levitate over and over on a player that's supposed to be flying
if (!isFlying)
{
ptr.getClass().getCreatureStats(ptr).getActiveSpells().purgeEffect(ESM::MagicEffect::Levitate);
}
else if (isFlying && !world->isFlying(ptr))
{
MWMechanics::CastSpell cast(ptr, ptr);
cast.mHitPosition = ptr.getRefData().getPosition().asVec3();
cast.mAlwaysSucceed = true;
cast.cast("Levitate");
}
}
void DedicatedPlayer::updatePtr(MWWorld::Ptr newPtr)
{
ptr.mCell = newPtr.mCell;
ptr.mRef = newPtr.mRef;
ptr.mContainerStore = newPtr.mContainerStore;
// Disallow this player's reference from moving across cells until
// the correct packet is sent by the player
ptr.getBase()->canChangeCell = false;
}
DedicatedPlayer *PlayerList::newPlayer(RakNet::RakNetGUID guid)
{
LOG_APPEND(Log::LOG_INFO, "- Creating new DedicatedPlayer with guid %lu", guid.g);
if (drawState == 0)
ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Nothing);
else if (drawState == 1)
ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Weapon);
else if (drawState == 2)
ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Spell);
players[guid] = new DedicatedPlayer(guid);
players[guid]->state = 0;
return players[guid];
MWMechanics::NpcStats *ptrNpcStats = &ptr.getClass().getNpcStats(ptr);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_Run, (movementFlags & CreatureStats::Flag_Run) != 0);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_Sneak, (movementFlags & CreatureStats::Flag_Sneak) != 0);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_ForceJump, (movementFlags & CreatureStats::Flag_ForceJump) != 0);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_ForceMoveJump, (movementFlags & CreatureStats::Flag_ForceMoveJump) != 0);
}
void DedicatedPlayer::updateEquipment()
@ -311,55 +332,6 @@ void DedicatedPlayer::updateEquipment()
}
}
DedicatedPlayer *PlayerList::getPlayer(const MWWorld::Ptr &ptr)
{
std::map <RakNet::RakNetGUID, DedicatedPlayer *>::iterator it = players.begin();
for (; it != players.end(); it++)
{
if (it->second == 0 || it->second->getPtr().mRef == 0)
continue;
string refid = ptr.getCellRef().getRefId();
if (it->second->getPtr().getCellRef().getRefId() == refid)
return it->second;
}
return 0;
}
void DedicatedPlayer::updateAnimFlags()
{
using namespace MWMechanics;
MWBase::World *world = MWBase::Environment::get().getWorld();
// Until we figure out a better workaround for disabling player gravity,
// simply cast Levitate over and over on a player that's supposed to be flying
if (!isFlying)
{
ptr.getClass().getCreatureStats(ptr).getActiveSpells().purgeEffect(ESM::MagicEffect::Levitate);
}
else if (isFlying && !world->isFlying(ptr))
{
MWMechanics::CastSpell cast(ptr, ptr);
cast.mHitPosition = ptr.getRefData().getPosition().asVec3();
cast.mAlwaysSucceed = true;
cast.cast("Levitate");
}
if (drawState == 0)
ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Nothing);
else if (drawState == 1)
ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Weapon);
else if (drawState == 2)
ptr.getClass().getNpcStats(ptr).setDrawState(DrawState_Spell);
MWMechanics::NpcStats *ptrNpcStats = &ptr.getClass().getNpcStats(ptr);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_Run, (movementFlags & CreatureStats::Flag_Run) != 0);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_Sneak, (movementFlags & CreatureStats::Flag_Sneak) != 0);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_ForceJump, (movementFlags & CreatureStats::Flag_ForceJump) != 0);
ptrNpcStats->setMovementFlag(CreatureStats::Flag_ForceMoveJump, (movementFlags & CreatureStats::Flag_ForceMoveJump) != 0);
}
void DedicatedPlayer::updateCell()
{
// Prevent cell update when player hasn't been instantiated yet
@ -371,7 +343,7 @@ void DedicatedPlayer::updateCell()
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Server says %s (%s) moved to %s", ptr.getBase()->mRef.getRefId().c_str(),
this->npc.mName.c_str(), cell.getDescription().c_str());
this->npc.mName.c_str(), cell.getDescription().c_str());
try
{
@ -403,7 +375,6 @@ void DedicatedPlayer::updateCell()
}
}
void DedicatedPlayer::updateMarker()
{
if (!markerEnabled)
@ -445,3 +416,29 @@ void DedicatedPlayer::updateActor(MWMechanics::Actor *actor)
{
actor->getCharacterController()->setAttackingOrSpell(attack.pressed);
}
MWWorld::Ptr DedicatedPlayer::getPtr()
{
return ptr;
}
MWWorld::Ptr DedicatedPlayer::getLiveCellPtr()
{
return reference->getPtr();
}
MWWorld::ManualRef *DedicatedPlayer::getRef()
{
return reference;
}
void DedicatedPlayer::updatePtr(MWWorld::Ptr newPtr)
{
ptr.mCell = newPtr.mCell;
ptr.mRef = newPtr.mRef;
ptr.mContainerStore = newPtr.mContainerStore;
// Disallow this player's reference from moving across cells until
// the correct packet is sent by the player
ptr.getBase()->canChangeCell = false;
}

16
apps/openmw/mwmp/DedicatedPlayer.hpp
Unescape Escape View File

@ -29,13 +29,16 @@ namespace mwmp
{
public:
static DedicatedPlayer *newPlayer(RakNet::RakNetGUID guid);
static void update(float dt);
static void createPlayer(RakNet::RakNetGUID guid);
static DedicatedPlayer *newPlayer(RakNet::RakNetGUID guid);
static void disconnectPlayer(RakNet::RakNetGUID guid);
static void cleanUp();
static DedicatedPlayer *getPlayer(RakNet::RakNetGUID guid);
static DedicatedPlayer *getPlayer(const MWWorld::Ptr &ptr);
static void update(float dt);
private:
@ -48,13 +51,9 @@ namespace mwmp
public:
MWWorld::Ptr getPtr();
MWWorld::Ptr getLiveCellPtr();
MWWorld::ManualRef* getRef();
void move(float dt);
void updateAnimFlags();
void updateEquipment();
void updateCell();
void updateMarker();
@ -62,10 +61,15 @@ namespace mwmp
void setMarkerState(bool state);
void updateActor(MWMechanics::Actor *actor);
MWWorld::Ptr getPtr();
MWWorld::Ptr getLiveCellPtr();
MWWorld::ManualRef* getRef();
private:
DedicatedPlayer(RakNet::RakNetGUID guid);
virtual ~DedicatedPlayer();
void updatePtr(MWWorld::Ptr newPtr);
int state;

Write Preview
Loading…
Cancel
Save