Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r19090) -Codechange: some comment coding style fixes

Browse Source
This commit is contained in:
rubidium 2010-02-10 21:06:05 +00:00
parent 970842e4a2
commit a7a2568985
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/company_gui.cpp
View File

@ -1328,25 +1328,25 @@ public:
case SCMFW_WIDGET_HAS_MOUSTACHE_EARRING: 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); 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); this->DrawFaceStringLabel(SCMFW_WIDGET_HAS_MOUSTACHE_EARRING, GetCompanyManagerFaceBits(this->face, CMFV_HAS_MOUSTACHE, this->ge), true);
} }
break; break;
case SCMFW_WIDGET_TIE_EARRING: 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); 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); this->DrawFaceStringLabel(SCMFW_WIDGET_TIE_EARRING, GetCompanyManagerFaceBits(this->face, CMFV_TIE_EARRING, this->ge), false);
} }
break; break;
case SCMFW_WIDGET_LIPS_MOUSTACHE: 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); 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); this->DrawFaceStringLabel(SCMFW_WIDGET_LIPS_MOUSTACHE, GetCompanyManagerFaceBits(this->face, CMFV_LIPS, this->ge), false);
} }
break; break;

2
src/graph_gui.cpp
View File

@ -842,7 +842,7 @@ struct PaymentRatesGraphWindow : BaseGraphWindow {
const CargoSpec *cs = CargoSpec::Get(widget - CPW_CARGO_FIRST); const CargoSpec *cs = CargoSpec::Get(widget - CPW_CARGO_FIRST);
SetDParam(0, cs->name); SetDParam(0, cs->name);
Dimension d = GetStringBoundingBox(STR_GRAPH_CARGO_PAYMENT_CARGO); 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.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
*size = maxdim(d, *size); *size = maxdim(d, *size);

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

@ -40,7 +40,7 @@ typedef unsigned long in_addr_t;
#include "../../os/windows/win32.h" #include "../../os/windows/win32.h"
#include "../../core/alloc_func.hpp" #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 #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) static inline int OTTDgetnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, DWORD hostlen, char *serv, DWORD servlen, int flags)

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

@ -175,7 +175,7 @@ int NetworkHTTPSocketHandler::HandleHeader()
return 0; 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, "://"); char *hname = strstr(uri, "://");
if (hname == NULL) return_error("[tcp/http] invalid location"); if (hname == NULL) return_error("[tcp/http] invalid location");

2
src/saveload/vehicle_sl.cpp
View File

@ -715,7 +715,7 @@ void Load_VEHS()
case VEH_AIRCRAFT: v = new (index) Aircraft(); break; case VEH_AIRCRAFT: v = new (index) Aircraft(); break;
case VEH_EFFECT: v = new (index) EffectVehicle(); break; case VEH_EFFECT: v = new (index) EffectVehicle(); break;
case VEH_DISASTER: v = new (index) DisasterVehicle(); 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(); default: NOT_REACHED();
} }

2
src/train.h
View File

@ -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. * Allows to know the power value that this vehicle will use.