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

Make formatting consistent

Browse source
This commit is contained in:
David Cernat 2016-08-17 18:04:35 +03:00
parent 1bbd7c271f
commit 1363c4c5b6
16 changed files with 124 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -360,18 +360,23 @@ void LocalPlayer::updateCell(bool forceUpdate)
// 2) The LocalPlayer's cell name does not equal the World Player's cell name
// 3) The LocalPlayer's exterior cell coordinates do not equal the World Player's
// exterior cell coordinates
if (forceUpdate) {
if (forceUpdate)
{
shouldUpdate = true;
}
else if (!Misc::StringUtils::ciEqual(_cell->mName, GetCell()->mName)) {
else if (!Misc::StringUtils::ciEqual(_cell->mName, GetCell()->mName))
{
shouldUpdate = true;
}
else if (_cell->isExterior()) {
else if (_cell->isExterior())
{
if (_cell->mCellId.mIndex.mX != GetCell()->mCellId.mIndex.mX) {
if (_cell->mCellId.mIndex.mX != GetCell()->mCellId.mIndex.mX)
{
shouldUpdate = true;
}
else if (_cell->mCellId.mIndex.mY != GetCell()->mCellId.mIndex.mY) {
else if (_cell->mCellId.mIndex.mY != GetCell()->mCellId.mIndex.mY)
{
shouldUpdate = true;
}
}
@ -480,7 +485,9 @@ bool LocalPlayer::CharGenThread() // ToDo: need fix
{
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
(*Npc()) = *player.get<ESM::NPC>()->mBase;
GetNetworking()->GetPacket(ID_GAME_BASE_INFO)->Send(this);
if(CharGenStage()->end != 1)
{
updateBaseStats(true);

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

@ -76,7 +76,7 @@ void Networking::Update()
MWBase::Environment::get().getStateManager()->requestQuit();
break;
default:
ReciveMessage(packet);
ReceiveMessage(packet);
//printf("Message with identifier %i has arrived.\n", packet->data[0]);
break;
}
@ -153,7 +153,7 @@ void Networking::Connect(const std::string &ip, unsigned short port)
}
}
void Networking::ReciveMessage(RakNet::Packet *packet)
void Networking::ReceiveMessage(RakNet::Packet *packet)
{
RakNet::RakNetGUID id;

2
apps/openmw/mwmp/Networking.hpp
View file

@ -54,7 +54,7 @@ namespace mwmp
PacketsController controller;
void ReciveMessage(RakNet::Packet *packet);
void ReceiveMessage(RakNet::Packet *packet);
LocalPlayer *getLocalPlayer();
};
}