cpp/openttd-patchpack/source Changeset - r9896:f1ef27efac7c

Changeset - r9896:f1ef27efac7c

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

rubidium - 16 years ago 2008-08-11 22:07:26
rubidium@openttd.org

(svn r14045) -Codechange: move the network's limitation to chat messages to a more logical location and give it a more consistent name.

5 files changed with 8 insertions and 9 deletions:

src/network/core/config.h

src/network/network_client.cpp

src/network/network_internal.h

src/network/network_server.cpp

src/network/network_type.h

0 comments (0 inline, 0 general)

src/network/core/config.h

➞

Show inline comments

@@ @@ -32,6 +32,7 @@ enum { @@
 	NETWORK_PLAYERS_LENGTH        =  200, ///< The maximum length for the list of players that controls a company, in bytes including '\0'
 	NETWORK_CLIENT_NAME_LENGTH    =   25, ///< The maximum length of a player, in bytes including '\0'
 	NETWORK_RCONCOMMAND_LENGTH    =  500, ///< The maximum length of a rconsole command, in bytes including '\0'
 	NETWORK_CHAT_LENGTH           = 1000, ///< The maximum length of a chat message, in bytes including '\0'
 	NETWORK_GRF_NAME_LENGTH       =   80, ///< Maximum length of the name of a GRF
 	/**

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -245,7 +245,7 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLI @@
 	//    uint8:  ActionID (see network_data.h, NetworkAction)
 	//    uint8:  Destination Type (see network_data.h, DestType);
 	//    uint16: Destination Player
-	//    String: Message (max MAX_TEXT_MSG_LEN)
+	//    String: Message (max NETWORK_CHAT_LENGTH)
 	//
 	Packet *p = NetworkSend_Init(PACKET_CLIENT_CHAT);
@@ @@ -713,13 +713,13 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER @@
 DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT)
+{
-	char name[NETWORK_NAME_LENGTH], msg[MAX_TEXT_MSG_LEN];
+	char name[NETWORK_NAME_LENGTH], msg[NETWORK_CHAT_LENGTH];
 	const NetworkClientInfo *ci = NULL, *ci_to;
 	NetworkAction action = (NetworkAction)p->Recv_uint8();
 	uint16 index = p->Recv_uint16();
 	bool self_send = p->Recv_bool();
-	p->Recv_string(msg, MAX_TEXT_MSG_LEN);
+	p->Recv_string(msg, NETWORK_CHAT_LENGTH);
 	ci_to = NetworkFindClientInfoFromIndex(index);
 	if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY;

src/network/network_internal.h

➞

Show inline comments

@@ @@ -32,8 +32,6 @@ @@
  */
 //#define NETWORK_SEND_DOUBLE_SEED
 #define MAX_TEXT_MSG_LEN 1024 /* long long long long sentences :-) */
 enum MapPacket {
 	MAP_PACKET_START,
 	MAP_PACKET_NORMAL,

src/network/network_server.cpp

➞

Show inline comments

@@ @@ -509,7 +509,7 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SER @@
 	// Data:
 	//    uint8:  ActionID (see network_data.h, NetworkAction)
 	//    uint16:  Client-index
-	//    String: Message (max MAX_TEXT_MSG_LEN)
+	//    String: Message (max NETWORK_CHAT_LENGTH)
 	//
 	Packet *p = NetworkSend_Init(PACKET_SERVER_CHAT);
@@ @@ -1160,9 +1160,9 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT @@
 	NetworkAction action = (NetworkAction)p->Recv_uint8();
 	DestType desttype = (DestType)p->Recv_uint8();
 	int dest = p->Recv_uint16();
-	char msg[MAX_TEXT_MSG_LEN];
+	char msg[NETWORK_CHAT_LENGTH];
-	p->Recv_string(msg, MAX_TEXT_MSG_LEN);
+	p->Recv_string(msg, NETWORK_CHAT_LENGTH);
 	const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
 	switch (action) {

src/network/network_type.h

➞

Show inline comments

 /* $Id$ */
-/** @file network_internal.h Variables and function used internally. */
+/** @file network_type.h Types used for networking. */
 #ifndef NETWORK_TYPE_H
 #define NETWORK_TYPE_H

0 comments (0 inline, 0 general)