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

(svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow)

Browse Source
This commit is contained in:
planetmaker
2013-01-08 22:46:42 +00:00
parent 89a2ba2a6d
commit c24374f99c
242 changed files with 528 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/address.cpp
View File

@@ -259,7 +259,7 @@ SOCKET NetworkAddress::Resolve(int family, int socktype, int flags, SocketList *
for (struct addrinfo *runp = ai; runp != NULL; runp = runp->ai_next) {
/* When we are binding to multiple sockets, make sure we do not
* connect to one with exactly the same address twice. That's
* ofcourse totally unneeded ;) */
* of course totally unneeded ;) */
if (sockets != NULL) {
NetworkAddress address(runp->ai_addr, (int)runp->ai_addrlen);
if (sockets->Contains(address)) continue;

2
src/network/core/core.cpp
View File

@@ -51,7 +51,7 @@ bool NetworkCoreInitialize()
if (OpenDevice("timer.device", UNIT_MICROHZ, (struct IORequest*)TimerRequest, 0) == 0) {
TimerBase = TimerRequest->tr_node.io_Device;
if (TimerBase == NULL) {
/* free ressources... */
/* free resources... */
DEBUG(net, 0, "[core] can't initialize timer, network unavailable");
return false;
}

6
src/network/core/core.h
View File

@@ -28,12 +28,12 @@ enum NetworkRecvStatus {
NETWORK_RECV_STATUS_DESYNC, ///< A desync did occur
NETWORK_RECV_STATUS_NEWGRF_MISMATCH, ///< We did not have the required NewGRFs
NETWORK_RECV_STATUS_SAVEGAME, ///< Something went wrong (down)loading the savegame
NETWORK_RECV_STATUS_CONN_LOST, ///< The conection is 'just' lost
NETWORK_RECV_STATUS_CONN_LOST, ///< The connection is 'just' lost
NETWORK_RECV_STATUS_MALFORMED_PACKET, ///< We apparently send a malformed packet
NETWORK_RECV_STATUS_SERVER_ERROR, ///< The server told us we made an error
NETWORK_RECV_STATUS_SERVER_FULL, ///< The server is full
NETWORK_RECV_STATUS_SERVER_BANNED, ///< The server has banned us
NETWORK_RECV_STATUS_CLOSE_QUERY, ///< Done quering the server
NETWORK_RECV_STATUS_CLOSE_QUERY, ///< Done querying the server
};
/** Forward declaration due to circular dependencies */
@@ -48,7 +48,7 @@ public:
/** Create a new unbound socket */
NetworkSocketHandler() { this->has_quit = false; }
/** Close the socket when distructing the socket handler */
/** Close the socket when destructing the socket handler */
virtual ~NetworkSocketHandler() { this->Close(); }
/** Really close the socket */

2
src/network/core/tcp.h
View File

@@ -52,7 +52,7 @@ public:
/**
* Whether there is something pending in the send queue.
* @return true when someting is pending in the send queue.
* @return true when something is pending in the send queue.
*/
bool HasSendQueue() { return this->packet_queue != NULL; }

2
src/network/core/tcp_admin.h
View File

@@ -339,7 +339,7 @@ protected:
virtual NetworkRecvStatus Receive_SERVER_COMPANY_UPDATE(Packet *p);
/**
* Notification about a removed company (e.g. due to banrkuptcy).
* Notification about a removed company (e.g. due to bankruptcy).
* uint8 ID of the company.
* uint8 Reason for being removed (see #AdminCompanyRemoveReason).
* @param p The packet that was just received.

2
src/network/core/tcp_content.h
View File

@@ -139,7 +139,7 @@ protected:
/**
* Client requesting a list of content info based on an external
* 'unique' id; GRF ID + MD5 checksum for NewGRFS, shortname and
* xor-ed MD5 checsums for base graphics and AIs.
* xor-ed MD5 checksums for base graphics and AIs.
* Scenarios and AI libraries are not supported
* uint8 count of requests
* for each request:

10
src/network/core/tcp_game.h
View File

@@ -326,8 +326,8 @@ protected:
* Sends the current frame counter to the client:
* uint32 Frame counter
* uint32 Frame counter max (how far may the client walk before the server?)
* uint32 General seed 1 (dependant on compile settings, not default).
* uint32 General seed 2 (dependant on compile settings, not default).
* uint32 General seed 1 (dependent on compile settings, not default).
* uint32 General seed 2 (dependent on compile settings, not default).
* uint8 Random token to validate the client is actually listening (only occasionally present).
* @param p The packet that was just received.
*/
@@ -337,7 +337,7 @@ protected:
* Sends a sync-check to the client:
* uint32 Frame counter.
* uint32 General seed 1.
* uint32 General seed 2 (dependant on compile settings, not default).
* uint32 General seed 2 (dependent on compile settings, not default).
* @param p The packet that was just received.
*/
virtual NetworkRecvStatus Receive_SERVER_SYNC(Packet *p);
@@ -413,13 +413,13 @@ protected:
virtual NetworkRecvStatus Receive_CLIENT_SET_NAME(Packet *p);
/**
* The client is quiting the game.
* The client is quitting the game.
* @param p The packet that was just received.
*/
virtual NetworkRecvStatus Receive_CLIENT_QUIT(Packet *p);
/**
* The client made an error and is quiting the game.
* The client made an error and is quitting the game.
* uint8 Error of the code caused (see NetworkErrorCode).
* @param p The packet that was just received.
*/

2
src/network/core/tcp_http.cpp
View File

@@ -177,7 +177,7 @@ int NetworkHTTPSocketHandler::HandleHeader()
int ret = NetworkHTTPSocketHandler::Connect(uri, this->callback, this->data, this->redirect_depth + 1);
if (ret != 0) return ret;
/* We've relinguished control of data now. */
/* We've relinquished control of data now. */
this->data = NULL;
/* Restore the header. */

2
src/network/core/tcp_http.h
View File

@@ -117,7 +117,7 @@ public:
virtual void OnConnect(SOCKET s)
{
new NetworkHTTPSocketHandler(s, this->callback, this->address.GetHostname(), this->url, this->data, this->depth);
/* We've relinguished control of data now. */
/* We've relinquished control of data now. */
this->data = NULL;
}
};

4
src/network/core/udp.h
View File

@@ -27,7 +27,7 @@ enum PacketUDPType {
PACKET_UDP_CLIENT_DETAIL_INFO, ///< Queries a game server about details of the game, such as companies
PACKET_UDP_SERVER_DETAIL_INFO, ///< Reply of the game server about details of the game, such as companies
PACKET_UDP_SERVER_REGISTER, ///< Packet to register itself to the master server
PACKET_UDP_MASTER_ACK_REGISTER, ///< Packet indicating registration has succedeed
PACKET_UDP_MASTER_ACK_REGISTER, ///< Packet indicating registration has succeeded
PACKET_UDP_CLIENT_GET_LIST, ///< Request for serverlist from master server
PACKET_UDP_MASTER_RESPONSE_LIST, ///< Response from master server with server ip's + port's
PACKET_UDP_SERVER_UNREGISTER, ///< Request to be removed from the server-list
@@ -73,7 +73,7 @@ protected:
* all 1 the version of this packet's structure
*
* 4+ 1 number of GRFs attached (n)
* 4+ n * 20 unique identifier for GRF files. Constists of:
* 4+ n * 20 unique identifier for GRF files. Consists of:
* - one 4 byte variable with the GRF ID
* - 16 bytes (sent sequentially) for the MD5 checksum
* of the GRF