diff options
| -rw-r--r-- | src/company_gui.cpp | 12 | ||||
| -rw-r--r-- | src/graph_gui.cpp | 2 | ||||
| -rw-r--r-- | src/network/core/os_abstraction.h | 2 | ||||
| -rw-r--r-- | src/network/core/tcp_http.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 2 | ||||
| -rw-r--r-- | src/train.h | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 04795a512..ce9242c2b 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -1328,25 +1328,25 @@ public: case SCMFW_WIDGET_HAS_MOUSTACHE_EARRING: - if (this->is_female) { /* Only for female faces */ + if (this->is_female) { // Only for female faces this->DrawFaceStringLabel(SCMFW_WIDGET_HAS_MOUSTACHE_EARRING, GetCompanyManagerFaceBits(this->face, CMFV_HAS_TIE_EARRING, this->ge), true); - } else { /* Only for male faces */ + } else { // Only for male faces this->DrawFaceStringLabel(SCMFW_WIDGET_HAS_MOUSTACHE_EARRING, GetCompanyManagerFaceBits(this->face, CMFV_HAS_MOUSTACHE, this->ge), true); } break; case SCMFW_WIDGET_TIE_EARRING: - if (this->is_female) { /* Only for female faces */ + if (this->is_female) { // Only for female faces this->DrawFaceStringLabel(SCMFW_WIDGET_TIE_EARRING, GetCompanyManagerFaceBits(this->face, CMFV_TIE_EARRING, this->ge), false); - } else { /* Only for male faces */ + } else { // Only for male faces this->DrawFaceStringLabel(SCMFW_WIDGET_TIE_EARRING, GetCompanyManagerFaceBits(this->face, CMFV_TIE_EARRING, this->ge), false); } break; case SCMFW_WIDGET_LIPS_MOUSTACHE: - if (this->is_moust_male) { /* Only for male faces with moustache */ + if (this->is_moust_male) { // Only for male faces with moustache this->DrawFaceStringLabel(SCMFW_WIDGET_LIPS_MOUSTACHE, GetCompanyManagerFaceBits(this->face, CMFV_MOUSTACHE, this->ge), false); - } else { /* Only for female faces or male faces without moustache */ + } else { // Only for female faces or male faces without moustache this->DrawFaceStringLabel(SCMFW_WIDGET_LIPS_MOUSTACHE, GetCompanyManagerFaceBits(this->face, CMFV_LIPS, this->ge), false); } break; diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index 48d8b2862..5c4446c41 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -842,7 +842,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow { const CargoSpec *cs = CargoSpec::Get(widget - CPW_CARGO_FIRST); SetDParam(0, cs->name); Dimension d = GetStringBoundingBox(STR_GRAPH_CARGO_PAYMENT_CARGO); - d.width += 14; /* colour field */ + d.width += 14; // colour field d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT; d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; *size = maxdim(d, *size); diff --git a/src/network/core/os_abstraction.h b/src/network/core/os_abstraction.h index 01f2cf1f6..02f9aaca9 100644 --- a/src/network/core/os_abstraction.h +++ b/src/network/core/os_abstraction.h @@ -40,7 +40,7 @@ typedef unsigned long in_addr_t; #include "../../os/windows/win32.h" #include "../../core/alloc_func.hpp" -#define AI_ADDRCONFIG 0x00000400 // Resolution only if global address configured +#define AI_ADDRCONFIG 0x00000400 /* Resolution only if global address configured */ #define IPV6_V6ONLY 27 static inline int OTTDgetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, DWORD hostlen, char *serv, DWORD servlen, int flags) diff --git a/src/network/core/tcp_http.cpp b/src/network/core/tcp_http.cpp index afba28fce..a0303106b 100644 --- a/src/network/core/tcp_http.cpp +++ b/src/network/core/tcp_http.cpp @@ -175,7 +175,7 @@ int NetworkHTTPSocketHandler::HandleHeader() return 0; } -/*static */ int NetworkHTTPSocketHandler::Connect(char *uri, HTTPCallback *callback, const char *data, int depth) +/* static */ int NetworkHTTPSocketHandler::Connect(char *uri, HTTPCallback *callback, const char *data, int depth) { char *hname = strstr(uri, "://"); if (hname == NULL) return_error("[tcp/http] invalid location"); diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index c4780fe80..70ce2e1f3 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -715,7 +715,7 @@ void Load_VEHS() case VEH_AIRCRAFT: v = new (index) Aircraft(); break; case VEH_EFFECT: v = new (index) EffectVehicle(); break; case VEH_DISASTER: v = new (index) DisasterVehicle(); break; - case VEH_INVALID: /* Savegame shouldn't contain invalid vehicles */ + case VEH_INVALID: // Savegame shouldn't contain invalid vehicles default: NOT_REACHED(); } diff --git a/src/train.h b/src/train.h index a6a90d6f0..aadb48981 100644 --- a/src/train.h +++ b/src/train.h @@ -387,7 +387,7 @@ struct Train : public SpecializedVehicle<Train, VEH_TRAIN> { } -protected: /* These functions should not be called outside acceleration code. */ +protected: // These functions should not be called outside acceleration code. /** * Allows to know the power value that this vehicle will use. |