From 0b714e593f9ed298cc3bb6962e91b655a68113d5 Mon Sep 17 00:00:00 2001 From: stiffly Date: Thu, 17 Dec 2015 17:56:15 +0100 Subject: [PATCH] Removed WinLeakCheck. Minor variable name changes. removed IsWASDKeyDown struct --- include/Engine/Network/Client.h | 1 - include/Engine/Network/Server.h | 2 +- include/Engine/Network/SnapshotDefinitions.h | 8 ------ include/Engine/Network/WinLeakCheck.h | 17 ------------ src/Engine/Network/Client.cpp | 27 ++++++++++---------- 5 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 include/Engine/Network/WinLeakCheck.h diff --git a/include/Engine/Network/Client.h b/include/Engine/Network/Client.h index 1bf2f059..2b1f65f8 100644 --- a/include/Engine/Network/Client.h +++ b/include/Engine/Network/Client.h @@ -10,7 +10,6 @@ #include "Network/NetworkDefinitions.h" #include "Network/PlayerDefinition.h" #include "Network/SnapshotDefinitions.h" -#include "Network/WinLeakCheck.h" #include "Core/World.h" #include "Core/EventBroker.h" #include "Input/EInputCommand.h" diff --git a/include/Engine/Network/Server.h b/include/Engine/Network/Server.h index 17ca7136..4e298213 100644 --- a/include/Engine/Network/Server.h +++ b/include/Engine/Network/Server.h @@ -36,7 +36,7 @@ private: // Game logic World* m_World; EventBroker* m_EventBroker; - // size = ammount of players to create, stores playerID's + // vec.size() = ammount of players to create, stores playerID's std::vector m_PlayersToCreate; // Packet loss logic diff --git a/include/Engine/Network/SnapshotDefinitions.h b/include/Engine/Network/SnapshotDefinitions.h index 9fe8beca..b643d18c 100644 --- a/include/Engine/Network/SnapshotDefinitions.h +++ b/include/Engine/Network/SnapshotDefinitions.h @@ -9,12 +9,4 @@ struct SnapshotDefinitions std::string InputRight; }; -struct IsWASDKeyDown -{ - bool W = false; - bool A = false; - bool S = false; - bool D = false; -}; - #endif \ No newline at end of file diff --git a/include/Engine/Network/WinLeakCheck.h b/include/Engine/Network/WinLeakCheck.h deleted file mode 100644 index dc1216a7..00000000 --- a/include/Engine/Network/WinLeakCheck.h +++ /dev/null @@ -1,17 +0,0 @@ -#if defined (_WIN64) | defined(_WIN32) -#ifndef WinLeakeCheck_h__ -#define WinLeakeCheck_h__ - -//For memory leak checking -#define _CRTDBG_MAP_ALLOC -#include -#include - -#ifdef _DEBUG -#ifndef DBG_NEW -#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ ) -#define new DBG_NEW -#endif -#endif // _DEBUG -#endif -#endif \ No newline at end of file diff --git a/src/Engine/Network/Client.cpp b/src/Engine/Network/Client.cpp index ade0c00e..69513022 100644 --- a/src/Engine/Network/Client.cpp +++ b/src/Engine/Network/Client.cpp @@ -13,8 +13,7 @@ Client::Client() : m_Socket(m_IOService) Client::~Client() { - // will it work on linux? #if defined (_WIN64) | defined(_WIN32) otherwise. - _CrtDumpMemoryLeaks(); + } void Client::Start(World* world, EventBroker* eventBroker) @@ -182,9 +181,9 @@ void Client::parsePing() void Client::parseServerPing() { - Packet message(MessageType::ServerPing, m_SendPacketID); - message.WriteString("Ping recieved"); - send(message); + Packet packet(MessageType::ServerPing, m_SendPacketID); + packet.WriteString("Ping recieved"); + send(packet); } void Client::parseEventMessage(Packet& packet) @@ -257,25 +256,25 @@ void Client::send(Packet& packet) void Client::connect() { - Packet message(MessageType::Connect, m_SendPacketID); - message.WriteString(m_PlayerName); + Packet packet(MessageType::Connect, m_SendPacketID); + packet.WriteString(m_PlayerName); m_StartPingTime = std::clock(); - send(message); + send(packet); } void Client::disconnect() { - Packet message(MessageType::Connect, m_SendPacketID); - message.WriteString("+Disconnect"); - send(message); + Packet packet(MessageType::Connect, m_SendPacketID); + packet.WriteString("+Disconnect"); + send(packet); } void Client::ping() { - Packet message(MessageType::Connect, m_SendPacketID); - message.WriteString("Ping"); + Packet packet(MessageType::Connect, m_SendPacketID); + packet.WriteString("Ping"); m_StartPingTime = std::clock(); - send(message); + send(packet); } void Client::moveMessageHead(char*& data, size_t& length, size_t stepSize)