Mercurial > hg > openttd
changeset 14519:3c95cfb7a679 draft
(svn r19090) -Codechange: some comment coding style fixes
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 10 Feb 2010 21:06:05 +0000 |
| parents | 80b678d227a3 |
| children | 45f055caa455 |
| files | src/company_gui.cpp src/graph_gui.cpp src/network/core/os_abstraction.h src/network/core/tcp_http.cpp src/saveload/vehicle_sl.cpp src/train.h |
| diffstat | 6 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -1328,25 +1328,25 @@ 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;
--- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -842,7 +842,7 @@ 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);
--- a/src/network/core/os_abstraction.h +++ b/src/network/core/os_abstraction.h @@ -40,7 +40,7 @@ #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)
--- a/src/network/core/tcp_http.cpp +++ b/src/network/core/tcp_http.cpp @@ -175,7 +175,7 @@ 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");
--- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -715,7 +715,7 @@ 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(); }