remove WorldApply
This commit is contained in:
@@ -29,24 +29,6 @@
|
||||
|
||||
namespace td {
|
||||
|
||||
// TODO: get rid of this class
|
||||
class WorldApply : public protocol::PacketHandler {
|
||||
private:
|
||||
game::World& m_World;
|
||||
using protocol::PacketHandler::Handle;
|
||||
|
||||
public:
|
||||
WorldApply(game::World& a_World) : m_World(a_World) {}
|
||||
|
||||
void Handle(const protocol::packets::WorldHeaderPacket& a_Header) override {
|
||||
m_World.LoadMap(*a_Header);
|
||||
}
|
||||
|
||||
void Handle(const protocol::packets::WorldDataPacket& a_Data) override {
|
||||
m_World.LoadMap(*a_Data);
|
||||
}
|
||||
};
|
||||
|
||||
void Save(const protocol::PacketBase& header, const protocol::PacketBase& data) {
|
||||
auto comp = std::make_shared<sp::ZlibCompress>();
|
||||
|
||||
@@ -67,19 +49,15 @@ game::WorldPtr GetWorld() {
|
||||
|
||||
sp::MessageStream<protocol::PacketFactory> stream(std::move(out), std::move(comp));
|
||||
|
||||
auto header = stream.ReadMessage(protocol::PacketID::WorldHeader);
|
||||
auto data = stream.ReadMessage(protocol::PacketID::WorldData);
|
||||
auto header = stream.ReadConcreteMessage<protocol::packets::WorldHeaderPacket>();
|
||||
auto data = stream.ReadConcreteMessage<protocol::packets::WorldDataPacket>();
|
||||
|
||||
auto w = std::make_shared<game::World>();
|
||||
auto wa = std::make_shared<WorldApply>(*w);
|
||||
|
||||
protocol::PacketDispatcher d;
|
||||
d.RegisterHandler(wa);
|
||||
w->LoadMap(**header);
|
||||
w->LoadMap(**data);
|
||||
|
||||
d.Dispatch(*header);
|
||||
d.Dispatch(*data);
|
||||
|
||||
Save(*header, *data);
|
||||
// Save(*header, *data);
|
||||
|
||||
return w;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user