dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'send_money_company' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-03-03 22:42:07 +00:00
parent 7b88f7a290 9c74da46b1
commit 54494a0a7c
75 changed files with 237 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/network_client.cpp
View File

@@ -421,7 +421,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::SendCommand(const CommandPacke
}
/** Send a chat-packet over the network */
NetworkRecvStatus ClientNetworkGameSocketHandler::SendChat(NetworkAction action, DestType type, int dest, const char *msg, int64 data)
NetworkRecvStatus ClientNetworkGameSocketHandler::SendChat(NetworkAction action, DestType type, int dest, const char *msg, NetworkTextMessageData data)
{
Packet *p = new Packet(PACKET_CLIENT_CHAT);
@@ -429,7 +429,7 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::SendChat(NetworkAction action,
p->Send_uint8 (type);
p->Send_uint32(dest);
p->Send_string(msg);
p->Send_uint64(data);
data.send(p);
my_client->SendPacket(p);
return NETWORK_RECV_STATUS_OKAY;
@@ -953,7 +953,8 @@ NetworkRecvStatus ClientNetworkGameSocketHandler::Receive_SERVER_CHAT(Packet *p)
ClientID client_id = (ClientID)p->Recv_uint32();
bool self_send = p->Recv_bool();
p->Recv_string(msg, NETWORK_CHAT_LENGTH);
int64 data = p->Recv_uint64();
NetworkTextMessageData data;
data.recv(p);
ci_to = NetworkClientInfo::GetByClientID(client_id);
if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY;
@@ -1253,7 +1254,7 @@ void NetworkUpdateClientName()
* @param msg The actual message.
* @param data Arbitrary extra data.
*/
void NetworkClientSendChat(NetworkAction action, DestType type, int dest, const char *msg, int64 data)
void NetworkClientSendChat(NetworkAction action, DestType type, int dest, const char *msg, NetworkTextMessageData data)
{
MyClient::SendChat(action, type, dest, msg, data);
}