Made Network.h's Start() and Update pure virtual and removed cpp.

Removed unnecessary code from NetworkDefinitions.h.
Renamed sizeOfPackage to sizeOfPacket in Packet.cpp.
This commit is contained in:
Jocke
2015-12-18 10:21:56 +01:00
parent 0eb51a0fea
commit 97f8be1915
7 changed files with 19 additions and 44 deletions
+3 -2
View File
@@ -5,6 +5,7 @@
#include <ctime>
#include <glm/common.hpp>
#include <boost/asio.hpp>
#include "Network/MessageType.h"
#include "Network/NetworkDefinitions.h"
@@ -21,8 +22,8 @@ class Client : public Network
public:
Client();
~Client();
void Start(World* world, EventBroker* eventBroker);
void Update();
void Start(World* world, EventBroker* eventBroker) override;
void Update() override;
void Close();
private:
// Assio UDP logic
+3 -6
View File
@@ -8,12 +8,9 @@
class Network
{
public:
Network();
~Network();
virtual void Start(World* m_world, EventBroker *eventBroker);
virtual void Update();
protected:
virtual ~Network() { };
virtual void Start(World* m_world, EventBroker *eventBroker) = 0;
virtual void Update() = 0;
};
#endif
@@ -1,20 +1,8 @@
#ifndef NetworkDefines_h__
#define NetworkDefines_h__
#include <boost/asio/ip/udp.hpp>
#include <queue>
#include "Network/Packet.h"
#define BOARDSIZE 16
#define MAXCONNECTIONS 8
#define INPUTSIZE 128
#define PLAYERSPEED 0.2f;
typedef boost::shared_ptr<boost::asio::ip::udp::socket> socket_ptr;
typedef boost::shared_ptr<std::string> string_ptr;
typedef boost::shared_ptr<std::queue<string_ptr>> messageQueue_ptr;
#endif
+3 -2
View File
@@ -5,6 +5,7 @@
#include <ctime>
#include <glm/common.hpp>
#include <boost/asio/ip/udp.hpp>
#include "Network/MessageType.h"
#include "Network/NetworkDefinitions.h"
@@ -18,8 +19,8 @@ class Server : public Network
public:
Server();
~Server();
void Start(World* m_world, EventBroker *eventBroker);
void Update();
void Start(World* m_world, EventBroker *eventBroker) override;
void Update() override;
void Close();
private: