cpp/openttd-patchpack/source Changeset - r10269:00d11ecda622

Changeset - r10269:00d11ecda622

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

michi_cc - 16 years ago 2008-10-20 19:35:48
michi_cc@openttd.org

(svn r14504) -Cleanup: Use the right variable type for tile offsets.

3 files changed with 5 insertions and 5 deletions:

src/ai/trolly/trolly.cpp

src/town.h

src/town_cmd.cpp

0 comments (0 inline, 0 general)

src/ai/trolly/trolly.cpp

➞

Show inline comments

@@ @@ -1057,7 +1057,7 @@ static void AiNew_State_BuildPath(Compan @@
 				ret = AI_DoCommand(tile, DiagDirToRoadBits(ReverseDiagDir(dir1)), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD);
 				if (CmdSucceeded(ret)) {
-					TileIndex offset = TileOffsByDiagDir(dir1);
+					TileIndexDiff offset = TileOffsByDiagDir(dir1);
 					if (IsTileType(tile + offset, MP_CLEAR) || IsTileType(tile + offset, MP_TREES)) {
 						ret = AI_DoCommand(tile + offset, AiNew_GetRoadDirection(tile, tile + offset, tile + offset + offset), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD);
 						if (CmdSucceeded(ret)) {
@@ @@ -1069,7 +1069,7 @@ static void AiNew_State_BuildPath(Compan @@
 				ret = AI_DoCommand(tile, DiagDirToRoadBits(ReverseDiagDir(dir2)), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD);
 				if (CmdSucceeded(ret)) {
-					TileIndex offset = TileOffsByDiagDir(dir2);
+					TileIndexDiff offset = TileOffsByDiagDir(dir2);
 					if (IsTileType(tile + offset, MP_CLEAR) || IsTileType(tile + offset, MP_TREES)) {
 						ret = AI_DoCommand(tile + offset, AiNew_GetRoadDirection(tile, tile + offset, tile + offset + offset), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD);
 						if (CmdSucceeded(ret)) {
@@ @@ -1081,7 +1081,7 @@ static void AiNew_State_BuildPath(Compan @@
 				ret = AI_DoCommand(tile, DiagDirToRoadBits(dir3), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD);
 				if (CmdSucceeded(ret)) {
-					TileIndex offset = TileOffsByDiagDir(dir3);
+					TileIndexDiff offset = TileOffsByDiagDir(dir3);
 					if (IsTileType(tile + offset, MP_CLEAR) || IsTileType(tile + offset, MP_TREES)) {
 						ret = AI_DoCommand(tile + offset, AiNew_GetRoadDirection(tile, tile + offset, tile + offset + offset), 0, DC_EXEC | DC_NO_WATER, CMD_BUILD_ROAD);
 						if (CmdSucceeded(ret)) {

src/town.h

➞

Show inline comments

@@ @@ -299,7 +299,7 @@ static inline HouseSpec *GetHouseSpecs(H @@
 	return &_house_specs[house_id];
+}
-TileIndex GetHouseNorthPart(HouseID &house);
+TileIndexDiff GetHouseNorthPart(HouseID &house);
 /**
  * Check if a TownID is valid.

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -2026,7 +2026,7 @@ static void DoClearTownHouseHelper(TileI @@
  * @param house Is changed to the HouseID of the north tile of the same house
  * @return TileDiff from the tile of the given HouseID to the north tile
  */
-TileIndex GetHouseNorthPart(HouseID &house)
+TileIndexDiff GetHouseNorthPart(HouseID &house)
+{
 	if (house >= 3) { // house id 0,1,2 MUST be single tile houses, or this code breaks.
 		if (GetHouseSpecs(house - 1)->building_flags & TILE_SIZE_2x1) {

0 comments (0 inline, 0 general)