cpp/openttd-patchpack/source Changeset - r17029:db230fa072b4

Changeset - r17029:db230fa072b4

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

terkhen - 14 years ago 2011-01-14 11:55:40
terkhen@openttd.org

(svn r21776) -Codechange: Give a more appropriate name to the road connection function.
-Document: Add doxygen comments to the function.

2 files changed with 10 insertions and 4 deletions:

src/road_gui.cpp

src/road_gui.h

0 comments (0 inline, 0 general)

src/road_gui.cpp

➞

Show inline comments

@@ @@ -135,7 +135,12 @@ static const RoadTypeInfo _road_type_inf @@
 	},
 };
 static void BuildRoadOutsideStation(TileIndex tile, DiagDirection direction)
 /**
  * If required, connects a new structure to an existing road or tram by building the missing roadbit.
  * @param tile Tile containing the structure to connect.
  * @param direction Direction to check.
  */
 void ConnectRoadToStructure(TileIndex tile, DiagDirection direction)
+{
 	tile += TileOffsByDiagDir(direction);
 	/* if there is a roadpiece just outside of the station entrance, build a connecting route */
@@ @@ -153,7 +158,7 @@ void CcRoadDepot(const CommandCost &resu @@
 	DiagDirection dir = (DiagDirection)GB(p1, 0, 2);
 	SndPlayTileFx(SND_1F_SPLAT, tile);
 	if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
-	BuildRoadOutsideStation(tile, dir);
+	ConnectRoadToStructure(tile, dir);
+}
 /**
@@ @@ -179,9 +184,9 @@ void CcRoadStop(const CommandCost &resul @@
 	if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
 	TileArea roadstop_area(tile, GB(p1, 0, 8), GB(p1, 8, 8));
 	TILE_AREA_LOOP(cur_tile, roadstop_area) {
-		BuildRoadOutsideStation(cur_tile, dir);
+		ConnectRoadToStructure(cur_tile, dir);
 		/* For a drive-through road stop build connecting road for other entrance. */
-		if (HasBit(p2, 1)) BuildRoadOutsideStation(cur_tile, ReverseDiagDir(dir));
+		if (HasBit(p2, 1)) ConnectRoadToStructure(cur_tile, ReverseDiagDir(dir));
+	}
+}

src/road_gui.h

➞

Show inline comments

@@ @@ -16,5 +16,6 @@ @@
 struct Window *ShowBuildRoadToolbar(RoadType roadtype);
 struct Window *ShowBuildRoadScenToolbar();
 void ConnectRoadToStructure(TileIndex tile, DiagDirection direction);
 #endif /* ROAD_GUI_H */

0 comments (0 inline, 0 general)