Redressage des classes; seed est reçue du serveur
This commit is contained in:
		| @@ -1,29 +1,27 @@ | ||||
| #include "connection.h" | ||||
|  | ||||
| Connection::Connection(in_addr addr,  | ||||
| 					   std::string name,  | ||||
| 					   uint64_t id,  | ||||
| 					   uint64_t self_id, | ||||
| 				       uint64_t team_id):  | ||||
| 	m_addr(addr),  | ||||
| 	m_id(id),  | ||||
| 	m_sid(self_id), | ||||
| 	m_tid(team_id),  | ||||
| 	m_name(name) { | ||||
|  | ||||
|  | ||||
| Connection::Connection(SOCKET sock,  | ||||
| 					   sockaddr_in sockaddr,  | ||||
| 					   netprot::LoginInfo log,  | ||||
| 					   netprot::PlayerInfo play): | ||||
| 	m_sock(sock),  | ||||
| 	m_addr(sockaddr),  | ||||
| 	m_loginfo(log),  | ||||
| 	m_playinfo(play) { | ||||
|  | ||||
| } | ||||
|  | ||||
| Connection::~Connection() { | ||||
|  | ||||
| 	closesocket(m_sock); | ||||
| } | ||||
|  | ||||
| in_addr Connection::GetAddr() const { return m_addr; } | ||||
| uint64_t Connection::GetHash(bool self) const { return self? m_loginfo.sid: m_playinfo.id; } | ||||
|  | ||||
| uint64_t Connection::GetHash(bool self) const { return self? m_sid: m_id; } | ||||
| uint64_t Connection::GetTeamHash() const { return m_loginfo.tid; } | ||||
|  | ||||
| uint64_t Connection::GetTeamHash() const { return m_tid; } | ||||
|  | ||||
| std::string Connection::GetName() const { return m_name; } | ||||
| std::string Connection::GetName() const { return m_loginfo.name; } | ||||
|  | ||||
| void Connection::AddInput(netprot::Input in) { | ||||
| 	m_input_manifest.insert({ in.timestamp, in }); | ||||
| @@ -42,7 +40,7 @@ netprot::Sync Connection::getSync(Timestamp time) { | ||||
| 	if (out != m_output_manifest.end()) { | ||||
| 		sync.timestamp = out->second.timestamp; | ||||
| 		sync.position = out->second.position; | ||||
| 		sync.sid = m_sid; | ||||
| 		sync.sid = m_loginfo.sid; | ||||
| 	} | ||||
| 	return sync; | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user