mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 17:39:40 +00:00
Code Issues Releases Wiki Activity

Clean up handling of stat packets on client

Browse source
This commit is contained in:
David Cernat 2016-09-29 13:10:32 +03:00
parent bc0aa86bcf
commit afbd3274cc
3 changed files with 102 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -249,6 +249,45 @@ void LocalPlayer::setDynamicStats()
} }
} }
void LocalPlayer::setAttributes()
{
MWBase::World *world = MWBase::Environment::get().getWorld();
MWWorld::Ptr player = world->getPlayerPtr();
MWMechanics::CreatureStats *ptrCreatureStats = &player.getClass().getCreatureStats(player);
MWMechanics::AttributeValue attributeValue;
for (int i = 0; i < 8; ++i)
{
attributeValue.readState(CreatureStats()->mAttributes[i]);
ptrCreatureStats->setAttribute(i, attributeValue);
}
}
void LocalPlayer::setSkills()
{
MWBase::World *world = MWBase::Environment::get().getWorld();
MWWorld::Ptr player = world->getPlayerPtr();
MWMechanics::NpcStats *ptrNpcStats = &player.getClass().getNpcStats(player);
MWMechanics::SkillValue skillValue;
for (int i = 0; i < 27; ++i)
{
skillValue.readState(NpcStats()->mSkills[i]);
ptrNpcStats->setSkill(i, skillValue);
}
}
void LocalPlayer::setLevel()
{
MWBase::World *world = MWBase::Environment::get().getWorld();
MWWorld::Ptr player = world->getPlayerPtr();
MWMechanics::CreatureStats *ptrCreatureStats = &player.getClass().getCreatureStats(player);
ptrCreatureStats->setLevel(CreatureStats()->mLevel);
}
void LocalPlayer::updateInventory(bool forceUpdate) void LocalPlayer::updateInventory(bool forceUpdate)
{ {
MWWorld::Ptr player = GetPlayerPtr(); MWWorld::Ptr player = GetPlayerPtr();

3
apps/openmw/mwmp/LocalPlayer.hpp
View file

@ -32,6 +32,9 @@ namespace mwmp
void setPosition(); void setPosition();
void setCell(); void setCell();
void setDynamicStats(); void setDynamicStats();
void setAttributes();
void setSkills();
void setLevel();
void SetClass(); void SetClass();
void SendClass(); void SendClass();

124
apps/openmw/mwmp/Networking.cpp
View file

@ -352,14 +352,17 @@ void Networking::ReceiveMessage(RakNet::Packet *packet)
else if (pl != 0) else if (pl != 0)
{ {
myPacket->Packet(&bsIn, pl, false); myPacket->Packet(&bsIn, pl, false);
MWWorld::Ptr ptrPlayer = pl->getPtr();
MWMechanics::CreatureStats *ptrCreatureStats = &ptrPlayer.getClass().getCreatureStats(ptrPlayer);
MWMechanics::DynamicStat<float> value; MWMechanics::DynamicStat<float> value;
value.readState(pl->CreatureStats()->mDynamic[0]); value.readState(pl->CreatureStats()->mDynamic[0]);
pl->getPtr().getClass().getCreatureStats(pl->getPtr()).setHealth(value); ptrCreatureStats->setHealth(value);
value.readState(pl->CreatureStats()->mDynamic[1]); value.readState(pl->CreatureStats()->mDynamic[1]);
pl->getPtr().getClass().getCreatureStats(pl->getPtr()).setMagicka(value); ptrCreatureStats->setMagicka(value);
value.readState(pl->CreatureStats()->mDynamic[2]); value.readState(pl->CreatureStats()->mDynamic[2]);
pl->getPtr().getClass().getCreatureStats(pl->getPtr()).setFatigue(value); ptrCreatureStats->setFatigue(value);
} }
break; break;
} }
@ -461,6 +464,7 @@ void Networking::ReceiveMessage(RakNet::Packet *packet)
message = *pl->ChatMessage(); message = *pl->ChatMessage();
} }
Main::get().getGUIController()->PrintChatMessage(message); Main::get().getGUIController()->PrintChatMessage(message);
break; break;
} }
case ID_GAME_CHARGEN: case ID_GAME_CHARGEN:
@ -474,97 +478,89 @@ void Networking::ReceiveMessage(RakNet::Packet *packet)
case ID_GAME_ATTRIBUTE: case ID_GAME_ATTRIBUTE:
{ {
// Ignore requests for this packet
if (packet->length == myPacket->headerSize())
return;
BasePlayer *__pl = nullptr;
MWWorld::Ptr __pl_ptr;
if (id == myid) if (id == myid)
{ {
__pl = getLocalPlayer(); if (packet->length == myPacket->headerSize())
__pl_ptr = MWBase::Environment::get().getWorld()->getPlayerPtr(); {
getLocalPlayer()->updateClassStats(true);
}
else
{
myPacket->Packet(&bsIn, getLocalPlayer(), false);
getLocalPlayer()->setAttributes();
}
} }
else if (pl != 0) else if (pl != 0)
{ {
__pl = pl; myPacket->Packet(&bsIn, pl, false);
__pl_ptr = pl->getPtr();
}
else
return;
myPacket->Packet(&bsIn, __pl, false); MWWorld::Ptr ptrPlayer = pl->getPtr();
MWMechanics::CreatureStats *ptrCreatureStats = &ptrPlayer.getClass().getCreatureStats(ptrPlayer);
MWMechanics::AttributeValue attributeValue;
MWMechanics::AttributeValue attributeValue; for (int i = 0; i < 8; ++i)
{
for (int i = 0; i < 8; ++i) attributeValue.readState(pl->CreatureStats()->mAttributes[i]);
{ ptrCreatureStats->setAttribute(i, attributeValue);
attributeValue.readState(__pl->CreatureStats()->mAttributes[i]); }
__pl_ptr.getClass().getCreatureStats(__pl_ptr).setAttribute(i, attributeValue);
} }
break; break;
} }
case ID_GAME_SKILL: case ID_GAME_SKILL:
{ {
// Ignore requests for this packet
if (packet->length == myPacket->headerSize())
return;
BasePlayer *__pl = nullptr;
MWWorld::Ptr __pl_ptr;
if (id == myid) if (id == myid)
{ {
__pl = getLocalPlayer(); if (packet->length == myPacket->headerSize())
__pl_ptr = MWBase::Environment::get().getWorld()->getPlayerPtr(); {
getLocalPlayer()->updateClassStats(true);
}
else
{
myPacket->Packet(&bsIn, getLocalPlayer(), false);
getLocalPlayer()->setSkills();
}
} }
else if (pl != 0) else if (pl != 0)
{ {
__pl = pl; myPacket->Packet(&bsIn, pl, false);
__pl_ptr = pl->getPtr();
MWWorld::Ptr ptrPlayer = pl->getPtr();
MWMechanics::NpcStats *ptrNpcStats = &ptrPlayer.getClass().getNpcStats(ptrPlayer);
MWMechanics::SkillValue skillValue;
for (int i = 0; i < 27; ++i)
{
skillValue.readState(pl->NpcStats()->mSkills[i]);
ptrNpcStats->setSkill(i, skillValue);
}
} }
else
return;
myPacket->Packet(&bsIn, __pl, false);
MWMechanics::SkillValue skillValue;
for (int i = 0; i < 27; ++i)
{
skillValue.readState(__pl->NpcStats()->mSkills[i]);
__pl_ptr.getClass().getNpcStats(__pl_ptr).setSkill(i, skillValue);
//LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "skill %d, value %d", i, skillValue.getBase());
}
break; break;
} }
case ID_GAME_LEVEL: case ID_GAME_LEVEL:
{ {
// Ignore requests for this packet
if (packet->length == myPacket->headerSize())
return;
BasePlayer *__pl = nullptr;
MWWorld::Ptr __pl_ptr;
if (id == myid) if (id == myid)
{ {
__pl = getLocalPlayer(); if (packet->length == myPacket->headerSize())
__pl_ptr = MWBase::Environment::get().getWorld()->getPlayerPtr(); {
getLocalPlayer()->updateClassStats(true);
}
else
{
myPacket->Packet(&bsIn, getLocalPlayer(), false);
getLocalPlayer()->setLevel();
}
} }
else if (pl != 0) else if (pl != 0)
{ {
__pl = pl; myPacket->Packet(&bsIn, pl, false);
__pl_ptr = pl->getPtr();
MWWorld::Ptr ptrPlayer = pl->getPtr();
MWMechanics::CreatureStats *ptrCreatureStats = &ptrPlayer.getClass().getCreatureStats(ptrPlayer);
ptrCreatureStats->setLevel(pl->CreatureStats()->mLevel);
} }
else
return;
myPacket->Packet(&bsIn, __pl, false);
__pl_ptr.getClass().getCreatureStats(__pl_ptr).setLevel(__pl->CreatureStats()->mLevel);
break; break;
} }