Compare commits
No commits in common. "59918b86b12d5650861029d0078a80e04c0d8ec0" and "8aa44039b4eb1a4ff0b2c8350325dcbbb5b540fc" have entirely different histories.
59918b86b1
...
8aa44039b4
@ -14,13 +14,13 @@ void deerith::init_engine()
|
|||||||
init_log("client");
|
init_log("client");
|
||||||
init_network();
|
init_network();
|
||||||
|
|
||||||
deerith_trace("init engine");
|
deerith_info("init engine");
|
||||||
}
|
}
|
||||||
|
|
||||||
void deerith::shutdown_enigne()
|
void deerith::shutdown_enigne()
|
||||||
{
|
{
|
||||||
shutdown_executing_servers();
|
shutdown_executing_servers();
|
||||||
shutdown_network();
|
shutdown_network();
|
||||||
deerith_trace("shutdown engine");
|
deerith_info("shutdown engine");
|
||||||
shutdown_log();
|
shutdown_log();
|
||||||
}
|
}
|
||||||
@ -58,7 +58,7 @@ bool deerith::wait_till_connected_to_server()
|
|||||||
if (enet_host_service(client, &event, 5000) > 0 &&
|
if (enet_host_service(client, &event, 5000) > 0 &&
|
||||||
event.type == ENET_EVENT_TYPE_CONNECT)
|
event.type == ENET_EVENT_TYPE_CONNECT)
|
||||||
{
|
{
|
||||||
deerith_trace("Connected to server");
|
deerith_info("Connected to server");
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -49,14 +49,14 @@ void deerith::universe_simulation()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
deerith_trace("Universe stop");
|
deerith_trace("Thread stop");
|
||||||
universe_running = false;
|
universe_running = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void deerith::shutdown_universe()
|
void deerith::shutdown_universe()
|
||||||
{
|
{
|
||||||
universe_running = false;
|
|
||||||
if (universe_thread && universe_thread->joinable())
|
if (universe_thread && universe_thread->joinable())
|
||||||
universe_thread->join();
|
universe_thread->join();
|
||||||
|
universe_running = false;
|
||||||
universe_thread.reset();
|
universe_thread.reset();
|
||||||
}
|
}
|
||||||
@ -1,10 +1,4 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include <cstdint>
|
|
||||||
|
|
||||||
// At
|
|
||||||
#define UNIVERSE_SIMULATION_TICK_FREQ 50
|
|
||||||
#define NETWORK_RELATIVE_UNIVERSE_TICK 2
|
|
||||||
#define NETWORK_DELAY 6
|
|
||||||
|
|
||||||
namespace deerith
|
namespace deerith
|
||||||
{
|
{
|
||||||
|
|||||||
@ -24,7 +24,7 @@ void deerith::execute_server(const char *server_executable_path, int port)
|
|||||||
if (pid > 0)
|
if (pid > 0)
|
||||||
{
|
{
|
||||||
executing_servers.push_back(pid);
|
executing_servers.push_back(pid);
|
||||||
deerith_trace("server created");
|
deerith_info("server created");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@ -15,13 +15,13 @@ void deerith::init_engine()
|
|||||||
init_log("server");
|
init_log("server");
|
||||||
init_network();
|
init_network();
|
||||||
|
|
||||||
deerith_trace("init server engine");
|
deerith_info("init server engine");
|
||||||
}
|
}
|
||||||
|
|
||||||
void deerith::shutdown_enigne()
|
void deerith::shutdown_enigne()
|
||||||
{
|
{
|
||||||
shutdown_network();
|
shutdown_network();
|
||||||
|
|
||||||
deerith_trace("shutdown server engine");
|
deerith_info("shutdown server engine");
|
||||||
shutdown_log();
|
shutdown_log();
|
||||||
}
|
}
|
||||||
@ -60,5 +60,5 @@ void deerith::create_client(ENetPeer *client)
|
|||||||
{
|
{
|
||||||
char enet_address[32];
|
char enet_address[32];
|
||||||
enet_address_get_host_ip(&client->address, enet_address, 31);
|
enet_address_get_host_ip(&client->address, enet_address, 31);
|
||||||
deerith_trace("A new client has connected : {}", enet_address);
|
deerith_info("A new client has connected : {}", enet_address);
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user