mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r17682) -Codechange: remove erroneous space before some commas
This commit is contained in:
parent
9c6157c578
commit
e9624fe0cc
|
@ -1671,7 +1671,7 @@ DEF_CONSOLE_CMD(ConContent)
|
|||
IConsolePrintF(CC_WHITE, "id, type, state, name");
|
||||
for (ConstContentIterator iter = _network_content_client.Begin(); iter != _network_content_client.End(); iter++) {
|
||||
static const char * const types[] = { "Base graphics", "NewGRF", "AI", "AI library", "Scenario", "Heightmap" };
|
||||
static const char * const states[] = { "Not selected", "Selected" , "Dep Selected", "Installed", "Unknown" };
|
||||
static const char * const states[] = { "Not selected", "Selected", "Dep Selected", "Installed", "Unknown" };
|
||||
static const ConsoleColour state_to_colour[] = { CC_COMMAND, CC_INFO, CC_INFO, CC_WHITE, CC_ERROR };
|
||||
|
||||
const ContentInfo *ci = *iter;
|
||||
|
|
|
@ -907,7 +907,7 @@ void DeterminePaths(const char *exe)
|
|||
|
||||
if (_config_file != NULL) {
|
||||
_personal_dir = strdup(_config_file);
|
||||
char *end = strrchr(_personal_dir , PATHSEPCHAR);
|
||||
char *end = strrchr(_personal_dir, PATHSEPCHAR);
|
||||
if (end == NULL) {
|
||||
_personal_dir[0] = '\0';
|
||||
} else {
|
||||
|
|
|
@ -1554,8 +1554,8 @@ static void DoCreateNewIndustry(Industry *i, TileIndex tile, int type, const Ind
|
|||
!(HasBit(indspec->callback_mask, CBM_IND_PRODUCTION_256_TICKS) || HasBit(indspec->callback_mask, CBM_IND_PRODUCTION_CARGO_ARRIVAL)) && // production callbacks
|
||||
!(HasBit(indspec->callback_mask, CBM_IND_MONTHLYPROD_CHANGE) || HasBit(indspec->callback_mask, CBM_IND_PRODUCTION_CHANGE)) // production change callbacks
|
||||
) {
|
||||
i->production_rate[0] = min((RandomRange(256) + 128) * i->production_rate[0] >> 8 , 255);
|
||||
i->production_rate[1] = min((RandomRange(256) + 128) * i->production_rate[1] >> 8 , 255);
|
||||
i->production_rate[0] = min((RandomRange(256) + 128) * i->production_rate[0] >> 8, 255);
|
||||
i->production_rate[1] = min((RandomRange(256) + 128) * i->production_rate[1] >> 8, 255);
|
||||
}
|
||||
|
||||
i->town = t;
|
||||
|
|
|
@ -6070,7 +6070,7 @@ static void ActivateOldShore()
|
|||
DupSprite(SPR_ORIGINALSHORE_START + 1, SPR_SHORE_BASE + 1); // SLOPE_W
|
||||
DupSprite(SPR_ORIGINALSHORE_START + 2, SPR_SHORE_BASE + 2); // SLOPE_S
|
||||
DupSprite(SPR_ORIGINALSHORE_START + 6, SPR_SHORE_BASE + 3); // SLOPE_SW
|
||||
DupSprite(SPR_ORIGINALSHORE_START , SPR_SHORE_BASE + 4); // SLOPE_E
|
||||
DupSprite(SPR_ORIGINALSHORE_START + 0, SPR_SHORE_BASE + 4); // SLOPE_E
|
||||
DupSprite(SPR_ORIGINALSHORE_START + 4, SPR_SHORE_BASE + 6); // SLOPE_SE
|
||||
DupSprite(SPR_ORIGINALSHORE_START + 3, SPR_SHORE_BASE + 8); // SLOPE_N
|
||||
DupSprite(SPR_ORIGINALSHORE_START + 7, SPR_SHORE_BASE + 9); // SLOPE_NW
|
||||
|
|
|
@ -305,7 +305,7 @@ TileIndex GetNearbyTile(byte parameter, TileIndex tile)
|
|||
}
|
||||
|
||||
/**
|
||||
* Common part of station var 0x67 , house var 0x62, indtile var 0x60, industry var 0x62.
|
||||
* Common part of station var 0x67, house var 0x62, indtile var 0x60, industry var 0x62.
|
||||
*
|
||||
* @param tile the tile of interest.
|
||||
* @return 0czzbbss: c = TileType; zz = TileZ; bb: 7-3 zero, 4-2 TerrainType, 1 water/shore, 0 zero; ss = TileSlope
|
||||
|
|
|
@ -1380,7 +1380,7 @@ void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *bak)
|
|||
}
|
||||
|
||||
/* Restore vehicle order-index and service interval */
|
||||
DoCommandP(0, v->index, bak->orderindex | (bak->service_interval << 16) , CMD_RESTORE_ORDER_INDEX);
|
||||
DoCommandP(0, v->index, bak->orderindex | (bak->service_interval << 16), CMD_RESTORE_ORDER_INDEX);
|
||||
|
||||
/* Restore vehicle group */
|
||||
DoCommandP(0, bak->group, v->index, CMD_ADD_VEHICLE_GROUP);
|
||||
|
|
|
@ -322,7 +322,7 @@ void Station::RecomputeIndustriesNear()
|
|||
/* Compute maximum extent of acceptance rectangle wrt. station sign */
|
||||
TileIndex start_tile = this->xy;
|
||||
uint max_radius = max(
|
||||
max(DistanceManhattan(start_tile, TileXY(riv.rect.left , riv.rect.top)), DistanceManhattan(start_tile, TileXY(riv.rect.left , riv.rect.bottom))),
|
||||
max(DistanceManhattan(start_tile, TileXY(riv.rect.left, riv.rect.top)), DistanceManhattan(start_tile, TileXY(riv.rect.left, riv.rect.bottom))),
|
||||
max(DistanceManhattan(start_tile, TileXY(riv.rect.right, riv.rect.top)), DistanceManhattan(start_tile, TileXY(riv.rect.right, riv.rect.bottom)))
|
||||
);
|
||||
|
||||
|
|
|
@ -355,7 +355,7 @@ public:
|
|||
const CargoSpec *cs;
|
||||
FOR_ALL_CARGOSPECS(cs) {
|
||||
cg_ofst = HasBit(this->cargo_filter, cs->Index()) ? 2 : 1;
|
||||
GfxFillRect(x + cg_ofst, y + cg_ofst, x + cg_ofst + 10 , y + cg_ofst + 7, cs->rating_colour);
|
||||
GfxFillRect(x + cg_ofst, y + cg_ofst, x + cg_ofst + 10, y + cg_ofst + 7, cs->rating_colour);
|
||||
DrawString(x + cg_ofst, x + 12 + cg_ofst, y + cg_ofst, cs->abbrev, TC_BLACK, SA_CENTER);
|
||||
x += 14;
|
||||
i++;
|
||||
|
|
|
@ -224,7 +224,7 @@ static void TerraformClick_Level(Window *w)
|
|||
|
||||
static void TerraformClick_Dynamite(Window *w)
|
||||
{
|
||||
HandlePlacePushButton(w, TTW_DEMOLISH, ANIMCURSOR_DEMOLISH , HT_RECT, PlaceProc_DemolishArea);
|
||||
HandlePlacePushButton(w, TTW_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT, PlaceProc_DemolishArea);
|
||||
}
|
||||
|
||||
static void TerraformClick_BuyLand(Window *w)
|
||||
|
|
|
@ -538,7 +538,7 @@ static void HeightMapAdjustWaterLevel(amplitude_t water_percent, height_t h_max_
|
|||
* Transform the height map into new (normalized) height map:
|
||||
* values from range: h_min..h_water_level will become negative so it will be clamped to 0
|
||||
* values from range: h_water_level..h_max are transformed into 0..h_max_new
|
||||
* , where h_max_new is 4, 8, 12 or 16 depending on terrain type (very flat, flat, hilly, mountains)
|
||||
* where h_max_new is 4, 8, 12 or 16 depending on terrain type (very flat, flat, hilly, mountains)
|
||||
*/
|
||||
FOR_ALL_TILES_IN_HEIGHT(h) {
|
||||
/* Transform height from range h_water_level..h_max into 0..h_max_new range */
|
||||
|
|
|
@ -942,7 +942,7 @@ static void DrawTile_TunnelBridge(TileInfo *ti)
|
|||
if (catenary) EndSpriteCombine();
|
||||
|
||||
/* Add helper BB for sprite sorting, that separate the tunnel from things beside of it */
|
||||
AddSortableSpriteToDraw(SPR_EMPTY_BOUNDING_BOX, PAL_NONE, ti->x , ti->y , BB_data[6], BB_data[7], TILE_HEIGHT, ti->z);
|
||||
AddSortableSpriteToDraw(SPR_EMPTY_BOUNDING_BOX, PAL_NONE, ti->x, ti->y, BB_data[6], BB_data[7], TILE_HEIGHT, ti->z);
|
||||
AddSortableSpriteToDraw(SPR_EMPTY_BOUNDING_BOX, PAL_NONE, ti->x + BB_data[4], ti->y + BB_data[5], BB_data[6], BB_data[7], TILE_HEIGHT, ti->z);
|
||||
|
||||
DrawBridgeMiddle(ti);
|
||||
|
|
|
@ -177,7 +177,7 @@ static inline void EnlargeCompanyHQ(TileIndex t, byte size)
|
|||
assert(size <= 4);
|
||||
if (size <= GetCompanyHQSize(t)) return;
|
||||
|
||||
SetCompanyHQSize(t , size);
|
||||
SetCompanyHQSize(t, size);
|
||||
SetCompanyHQSize(t + TileDiffXY(0, 1), size);
|
||||
SetCompanyHQSize(t + TileDiffXY(1, 0), size);
|
||||
SetCompanyHQSize(t + TileDiffXY(1, 1), size);
|
||||
|
@ -263,7 +263,7 @@ static inline void MakeUnmovableHQHelper(TileIndex t, uint8 section, Owner o)
|
|||
*/
|
||||
static inline void MakeCompanyHQ(TileIndex t, Owner o)
|
||||
{
|
||||
MakeUnmovableHQHelper(t , 0, o);
|
||||
MakeUnmovableHQHelper(t, 0, o);
|
||||
MakeUnmovableHQHelper(t + TileDiffXY(0, 1), 1, o);
|
||||
MakeUnmovableHQHelper(t + TileDiffXY(1, 0), 2, o);
|
||||
MakeUnmovableHQHelper(t + TileDiffXY(1, 1), 3, o);
|
||||
|
|
|
@ -1123,9 +1123,9 @@ GetNewVehiclePosResult GetNewVehiclePos(const Vehicle *v)
|
|||
}
|
||||
|
||||
static const Direction _new_direction_table[] = {
|
||||
DIR_N , DIR_NW, DIR_W ,
|
||||
DIR_N, DIR_NW, DIR_W,
|
||||
DIR_NE, DIR_SE, DIR_SW,
|
||||
DIR_E , DIR_SE, DIR_S
|
||||
DIR_E, DIR_SE, DIR_S
|
||||
};
|
||||
|
||||
Direction GetDirectionTowards(const Vehicle *v, int x, int y)
|
||||
|
|
|
@ -443,7 +443,7 @@ CommandCost CmdCloneVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1, uint
|
|||
assert(w != NULL);
|
||||
|
||||
if (w->cargo_type != v->cargo_type || w->cargo_subtype != v->cargo_subtype) {
|
||||
CommandCost cost = DoCommand(0, w->index, v->cargo_type | (v->cargo_subtype << 8) | 1U << 16 , flags, GetCmdRefitVeh(v));
|
||||
CommandCost cost = DoCommand(0, w->index, v->cargo_type | (v->cargo_subtype << 8) | 1U << 16, flags, GetCmdRefitVeh(v));
|
||||
if (CmdSucceeded(cost)) total_cost.AddCost(cost);
|
||||
}
|
||||
|
||||
|
|
|
@ -241,7 +241,7 @@ static void DoSetViewportPosition(const Window *w, int left, int top, int width,
|
|||
|
||||
if (left + width > w->left + w->width) {
|
||||
DoSetViewportPosition(w, left, top, (w->left + w->width - left), height);
|
||||
DoSetViewportPosition(w, left + (w->left + w->width - left), top, width - (w->left + w->width - left) , height);
|
||||
DoSetViewportPosition(w, left + (w->left + w->width - left), top, width - (w->left + w->width - left), height);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -253,7 +253,7 @@ static void DoSetViewportPosition(const Window *w, int left, int top, int width,
|
|||
|
||||
if (top + height > w->top + w->height) {
|
||||
DoSetViewportPosition(w, left, top, width, (w->top + w->height - top));
|
||||
DoSetViewportPosition(w, left, top + (w->top + w->height - top), width , height - (w->top + w->height - top));
|
||||
DoSetViewportPosition(w, left, top + (w->top + w->height - top), width, height - (w->top + w->height - top));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -2164,8 +2164,8 @@ static const int8 scrollamt[16][2] = {
|
|||
{ 0, 0}, ///< 5 : left + right = nothing
|
||||
{ 2, -1}, ///< 6 : right + up
|
||||
{ 0, -2}, ///< 7 : right + left + up = up
|
||||
{ 0 ,2}, ///< 8 : down
|
||||
{-2 ,1}, ///< 9 : down + left
|
||||
{ 0, 2}, ///< 8 : down
|
||||
{-2, 1}, ///< 9 : down + left
|
||||
{ 0, 0}, ///< 10 : down + up = nothing
|
||||
{-2, 0}, ///< 11 : left + up + down = left
|
||||
{ 2, 1}, ///< 12 : down + right
|
||||
|
|
Loading…
Reference in New Issue