Removed WinLeakCheck. Minor variable name changes. removed IsWASDKeyDown struct

This commit is contained in:
stiffly
2015-12-17 17:56:15 +01:00
parent 076030a252
commit 0b714e593f
5 changed files with 14 additions and 41 deletions
-1
View File
@@ -10,7 +10,6 @@
#include "Network/NetworkDefinitions.h" #include "Network/NetworkDefinitions.h"
#include "Network/PlayerDefinition.h" #include "Network/PlayerDefinition.h"
#include "Network/SnapshotDefinitions.h" #include "Network/SnapshotDefinitions.h"
#include "Network/WinLeakCheck.h"
#include "Core/World.h" #include "Core/World.h"
#include "Core/EventBroker.h" #include "Core/EventBroker.h"
#include "Input/EInputCommand.h" #include "Input/EInputCommand.h"
+1 -1
View File
@@ -36,7 +36,7 @@ private:
// Game logic // Game logic
World* m_World; World* m_World;
EventBroker* m_EventBroker; EventBroker* m_EventBroker;
// size = ammount of players to create, stores playerID's // vec.size() = ammount of players to create, stores playerID's
std::vector<unsigned int> m_PlayersToCreate; std::vector<unsigned int> m_PlayersToCreate;
// Packet loss logic // Packet loss logic
@@ -9,12 +9,4 @@ struct SnapshotDefinitions
std::string InputRight; std::string InputRight;
}; };
struct IsWASDKeyDown
{
bool W = false;
bool A = false;
bool S = false;
bool D = false;
};
#endif #endif
-17
View File
@@ -1,17 +0,0 @@
#if defined (_WIN64) | defined(_WIN32)
#ifndef WinLeakeCheck_h__
#define WinLeakeCheck_h__
//For memory leak checking
#define _CRTDBG_MAP_ALLOC
#include <stdlib.h>
#include <crtdbg.h>
#ifdef _DEBUG
#ifndef DBG_NEW
#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
#define new DBG_NEW
#endif
#endif // _DEBUG
#endif
#endif
+13 -14
View File
@@ -13,8 +13,7 @@ Client::Client() : m_Socket(m_IOService)
Client::~Client() Client::~Client()
{ {
// will it work on linux? #if defined (_WIN64) | defined(_WIN32) otherwise.
_CrtDumpMemoryLeaks();
} }
void Client::Start(World* world, EventBroker* eventBroker) void Client::Start(World* world, EventBroker* eventBroker)
@@ -182,9 +181,9 @@ void Client::parsePing()
void Client::parseServerPing() void Client::parseServerPing()
{ {
Packet message(MessageType::ServerPing, m_SendPacketID); Packet packet(MessageType::ServerPing, m_SendPacketID);
message.WriteString("Ping recieved"); packet.WriteString("Ping recieved");
send(message); send(packet);
} }
void Client::parseEventMessage(Packet& packet) void Client::parseEventMessage(Packet& packet)
@@ -257,25 +256,25 @@ void Client::send(Packet& packet)
void Client::connect() void Client::connect()
{ {
Packet message(MessageType::Connect, m_SendPacketID); Packet packet(MessageType::Connect, m_SendPacketID);
message.WriteString(m_PlayerName); packet.WriteString(m_PlayerName);
m_StartPingTime = std::clock(); m_StartPingTime = std::clock();
send(message); send(packet);
} }
void Client::disconnect() void Client::disconnect()
{ {
Packet message(MessageType::Connect, m_SendPacketID); Packet packet(MessageType::Connect, m_SendPacketID);
message.WriteString("+Disconnect"); packet.WriteString("+Disconnect");
send(message); send(packet);
} }
void Client::ping() void Client::ping()
{ {
Packet message(MessageType::Connect, m_SendPacketID); Packet packet(MessageType::Connect, m_SendPacketID);
message.WriteString("Ping"); packet.WriteString("Ping");
m_StartPingTime = std::clock(); m_StartPingTime = std::clock();
send(message); send(packet);
} }
void Client::moveMessageHead(char*& data, size_t& length, size_t stepSize) void Client::moveMessageHead(char*& data, size_t& length, size_t stepSize)