diff options
author | smatz <smatz@openttd.org> | 2011-01-21 01:38:30 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2011-01-21 01:38:30 +0000 |
commit | 656caf16dbf2010fc742b1dfabcf317f2ab19748 (patch) | |
tree | 0c86433a178c72303ca22b19079d71c656ee7e75 | |
parent | 1ac51128f5524023c124873b76c3c7d17830e8a7 (diff) | |
download | openttd-656caf16dbf2010fc742b1dfabcf317f2ab19748.tar.xz |
(svn r21875) -Codechange: indentation of some comments was wrong
-rw-r--r-- | src/network/core/tcp_listen.h | 2 | ||||
-rw-r--r-- | src/network/network_client.cpp | 4 | ||||
-rw-r--r-- | src/saveload/saveload.cpp | 12 | ||||
-rw-r--r-- | src/strings.cpp | 4 | ||||
-rw-r--r-- | src/train_cmd.cpp | 2 | ||||
-rw-r--r-- | src/vehicle_gui.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/network/core/tcp_listen.h b/src/network/core/tcp_listen.h index 0223ad42f..9fdf339c3 100644 --- a/src/network/core/tcp_listen.h +++ b/src/network/core/tcp_listen.h @@ -75,7 +75,7 @@ public: /* Can we handle a new client? */ if (!Tsocket::AllowConnection()) { /* no more clients allowed? - * Send to the client that we are full! */ + * Send to the client that we are full! */ Packet p(Tfull_packet); p.PrepareToSend(); diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 15ad3c6d9..6924777c1 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -209,8 +209,8 @@ void ClientNetworkGameSocketHandler::ClientError(NetworkRecvStatus res) if (my_client->CanSendReceive()) { NetworkRecvStatus res = my_client->ReceivePackets(); if (res != NETWORK_RECV_STATUS_OKAY) { - /* The client made an error of which we can not recover - * close the client and drop back to main menu */ + /* The client made an error of which we can not recover. + * Close the connection and drop back to the main menu. */ my_client->ClientError(res); return false; } diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index 4d68133bc..ec0bec7b1 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -2026,12 +2026,12 @@ struct ZlibSaveFilter : SaveFilter { this->z.avail_out = sizeof(buf); /** - * For the poor next soul who sees many valgrind warnings of the - * "Conditional jump or move depends on uninitialised value(s)" kind: - * According to the author of zlib it is not a bug and it won't be fixed. - * http://groups.google.com/group/comp.compression/browse_thread/thread/b154b8def8c2a3ef/cdf9b8729ce17ee2 - * [Mark Adler, Feb 24 2004, 'zlib-1.2.1 valgrind warnings' in the newgroup comp.compression] - */ + * For the poor next soul who sees many valgrind warnings of the + * "Conditional jump or move depends on uninitialised value(s)" kind: + * According to the author of zlib it is not a bug and it won't be fixed. + * http://groups.google.com/group/comp.compression/browse_thread/thread/b154b8def8c2a3ef/cdf9b8729ce17ee2 + * [Mark Adler, Feb 24 2004, 'zlib-1.2.1 valgrind warnings' in the newgroup comp.compression] + */ int r = deflate(&this->z, mode); /* bytes were emitted? */ diff --git a/src/strings.cpp b/src/strings.cpp index 8ef9bc81d..5646eccbc 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1745,8 +1745,8 @@ void CheckForMissingGlyphsInLoadedLanguagePack() if (bad_font) { /* Our fallback font does miss characters too, so keep the - * user chosen font as that is more likely to be any good than - * the wild guess we made */ + * user chosen font as that is more likely to be any good than + * the wild guess we made */ UninitFreeType(); InitFreeType(); } diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 0f77c2aa5..4d058396d 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -2772,7 +2772,7 @@ uint Train::Crash(bool flooded) } /* we may need to update crossing we were approaching, - * but must be updated after the train has been marked crashed */ + * but must be updated after the train has been marked crashed */ TileIndex crossing = TrainApproachingCrossingTile(this); if (crossing != INVALID_TILE) UpdateLevelCrossing(crossing); diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp index 98d5ad95d..e7f073ade 100644 --- a/src/vehicle_gui.cpp +++ b/src/vehicle_gui.cpp @@ -1416,7 +1416,7 @@ public: case VL_SHARED_ORDERS: // Shared Orders if (this->vehicles.Length() == 0) { /* We can't open this window without vehicles using this order - * and we should close the window when deleting the order */ + * and we should close the window when deleting the order. */ NOT_REACHED(); } SetDParam(0, this->vscroll->GetCount()); |