mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use economy date for network join date handling

pull/10700/head
Tyler Trahan 2024-01-21 12:44:27 -05:00
parent 9841e0ebd1
commit ea4f117579
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/network_base.h
View File

@ -14,7 +14,7 @@
#include "core/address.h" #include "core/address.h"
#include "../core/pool_type.hpp" #include "../core/pool_type.hpp"
#include "../company_type.h" #include "../company_type.h"
#include "../timer/timer_game_calendar.h" #include "../timer/timer_game_economy.h"
/** Type for the pool with client information. */ /** Type for the pool with client information. */
typedef Pool<NetworkClientInfo, ClientIndex, 8, MAX_CLIENT_SLOTS, PT_NCLIENT> NetworkClientInfoPool; typedef Pool<NetworkClientInfo, ClientIndex, 8, MAX_CLIENT_SLOTS, PT_NCLIENT> NetworkClientInfoPool;
@ -25,7 +25,7 @@ struct NetworkClientInfo : NetworkClientInfoPool::PoolItem<&_networkclientinfo_p
ClientID client_id; ///< Client identifier (same as ClientState->client_id) ClientID client_id; ///< Client identifier (same as ClientState->client_id)
std::string client_name; ///< Name of the client std::string client_name; ///< Name of the client
CompanyID client_playas; ///< As which company is this client playing (CompanyID) CompanyID client_playas; ///< As which company is this client playing (CompanyID)
TimerGameCalendar::Date join_date; ///< Gamedate the client has joined TimerGameEconomy::Date join_date; ///< Gamedate the client has joined
/** /**
* Create a new client. * Create a new client.

2
src/network/network_server.cpp
View File

@ -883,7 +883,7 @@ NetworkRecvStatus ServerNetworkGameSocketHandler::Receive_CLIENT_JOIN(Packet *p)
assert(NetworkClientInfo::CanAllocateItem()); assert(NetworkClientInfo::CanAllocateItem());
NetworkClientInfo *ci = new NetworkClientInfo(this->client_id); NetworkClientInfo *ci = new NetworkClientInfo(this->client_id);
this->SetInfo(ci); this->SetInfo(ci);
ci->join_date = TimerGameCalendar::date; ci->join_date = TimerGameEconomy::date;
ci->client_name = client_name; ci->client_name = client_name;
ci->client_playas = playas; ci->client_playas = playas;
Debug(desync, 1, "client: {:08x}; {:02x}; {:02x}; {:02x}", TimerGameEconomy::date, TimerGameEconomy::date_fract, (int)ci->client_playas, (int)ci->index); Debug(desync, 1, "client: {:08x}; {:02x}; {:02x}; {:02x}", TimerGameEconomy::date, TimerGameEconomy::date_fract, (int)ci->client_playas, (int)ci->index);