mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 22:45:34 +00:00
Code Issues Releases Wiki Activity

Fix errors remaining from merge with tes3mp-packetexpansion

Browse source
This commit is contained in:
David Cernat 2016-10-23 18:32:03 +03:00
parent c639337842
commit d85a1ee1a9
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -481,7 +481,7 @@ void LocalPlayer::updateInventory(bool forceUpdate)
inventory.count = (unsigned int) inventory.items.size();
inventory.action = Inventory::UPDATE;
Main::get().getNetworking()->GetPacket(ID_GAME_INVENTORY)->Send(this);
Main::get().getNetworking()->GetPlayerPacket(ID_GAME_INVENTORY)->Send(this);
}
void LocalPlayer::updateAttackState(bool forceUpdate)

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

@ -596,6 +596,7 @@ void Networking::ProcessPlayerPacket(RakNet::Packet *packet)
getLocalPlayer()->setClass();
}
}
}
case ID_GAME_INVENTORY:
{
if (id == myid)
@ -604,7 +605,7 @@ void Networking::ProcessPlayerPacket(RakNet::Packet *packet)
{
printf("ID_GAME_INVENTORY update only\n");
getLocalPlayer()->updateInventory(true);
GetPacket(ID_GAME_INVENTORY)->Send(getLocalPlayer());
GetPlayerPacket(ID_GAME_INVENTORY)->Send(getLocalPlayer());
}
else
{
@ -727,7 +728,6 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
default:
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Unhandled WorldPacket with identifier %i has arrived",
packet->data[0]);
>>>>>>> refs/remotes/origin/tes3mp-packetexpansion
}
}

2
components/CMakeLists.txt
View file

@ -155,7 +155,7 @@ add_component_dir (openmw-mp
Packets/Player/PacketDrawState Packets/Player/PacketChatMessage Packets/Player/PacketCharGen
Packets/Player/PacketAttribute Packets/Player/PacketSkill Packets/Player/PacketLevel
Packets/Player/PacketHandshake Packets/Player/PacketGUIBoxes Packets/Player/PacketClass
Packets/Player/PacketTime Packets/PacketInventory
Packets/Player/PacketTime Packets/Player/PacketInventory
Packets/World/PacketObjectDelete Packets/World/PacketObjectPlace)

0
components/openmw-mp/Packets/PacketInventory.cpp → components/openmw-mp/Packets/Player/PacketInventory.cpp
View file

2
components/openmw-mp/Packets/PacketInventory.hpp → components/openmw-mp/Packets/Player/PacketInventory.hpp
View file

@ -5,7 +5,7 @@
#ifndef OPENMW_PACKETINVENTORY_HPP
#define OPENMW_PACKETINVENTORY_HPP
#include <components/openmw-mp/Packets/PlayerPacket.hpp>
#include <components/openmw-mp/Packets/Player/PlayerPacket.hpp>
namespace mwmp
{