BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Random bugfixes and cleanup.

Browse Source
This commit is contained in:
stiffly
2015-12-08 18:24:08 +01:00
parent a8c0a1f294
commit 58db7b755a
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Server.h
+1 -4
View File
@@ -23,15 +23,12 @@ private:
boost::asio::ip::udp::endpoint m_ReceiverEndpoint; boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
boost::asio::io_service m_IOService; boost::asio::io_service m_IOService;
boost::asio::ip::udp::socket m_Socket; boost::asio::ip::udp::socket m_Socket;
// boost::asio::ip::udp::endpoint m_Connections[MAXCONNECTIONS];
PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS]; PlayerDefinition m_PlayerDefinitions[MAXCONNECTIONS];
//Timers //Timers
std::clock_t m_StartPingTime; std::clock_t m_StartPingTime;
std::clock_t m_StopTimes[8]; std::clock_t m_StopTimes[8];
// Game logic // Game logic
// std::string m_PlayerNames[MAXCONNECTIONS];
char m_GameBoard[BOARDSIZE][BOARDSIZE];
glm::vec2 m_PlayerPositions[8];
World* m_World; World* m_World;
// Threaded // Threaded
src/Engine/Network/Server.cpp
+7 -10
View File
@@ -14,11 +14,7 @@ void Server::Start(World* world)
m_World = world; m_World = world;
for (size_t i = 0; i < MAXCONNECTIONS; i++) { for (size_t i = 0; i < MAXCONNECTIONS; i++) {
m_StopTimes[i] = std::clock(); m_StopTimes[i] = std::clock();
m_PlayerPositions[i].x = -1;
m_PlayerPositions[i].y = -1;
} }
m_PlayerPositions[0].x = 0;
m_PlayerPositions[0].y = 0;
boost::thread_group threads; boost::thread_group threads;
std::cout << "I am Server. BIP BOP\n"; std::cout << "I am Server. BIP BOP\n";
@@ -32,7 +28,7 @@ void Server::Start(World* world)
void Server::DisplayLoop() void Server::DisplayLoop()
{ {
int lengthOfMsg = -1; int lengthOfMessage = -1;
std::clock_t previousePingMessage = std::clock(); std::clock_t previousePingMessage = std::clock();
std::clock_t previousSnapshotMessage = std::clock(); std::clock_t previousSnapshotMessage = std::clock();
std::clock_t timOutTimer = std::clock(); std::clock_t timOutTimer = std::clock();
@@ -279,12 +275,13 @@ void Server::Disconnect(int i)
{ {
Broadcast("A player disconnected"); Broadcast("A player disconnected");
std::cout << "Player " << i << " disconnected/Timed out" << std::endl; std::cout << "Player " << i << " disconnected/Timed out" << std::endl;
// Remove enteties and stuff
m_PlayerDefinitions[i].Endpoint = boost::asio::ip::udp::endpoint(); m_PlayerDefinitions[i].Endpoint = boost::asio::ip::udp::endpoint();
m_PlayerDefinitions[i].EntityID = -1; m_PlayerDefinitions[i].EntityID = -1;
m_PlayerDefinitions[i].Name = "Name not Set"; m_PlayerDefinitions[i].Name = "";
// Reset disconnected players position
m_PlayerPositions[i].x = -1;
m_PlayerPositions[i].y = -1;
} }
void Server::ParseEvent(char * data, size_t length) void Server::ParseEvent(char * data, size_t length)