cpp/openttd-patchpack/source Changeset - r12406:d60713d1c3ad

Changeset - r12406:d60713d1c3ad

Parent rev.

Child rev.

[Not reviewed]

master

0 6 0

rubidium - 15 years ago 2009-07-16 20:15:28
rubidium@openttd.org

(svn r16850) -Codechange: unify some naming of variables between waypoints and stations.

6 files changed with 15 insertions and 15 deletions:

src/saveload/afterload.cpp

src/saveload/waypoint_sl.cpp

src/viewport.cpp

src/waypoint.cpp

src/waypoint.h

src/waypoint_cmd.cpp

0 comments (0 inline, 0 general)

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -447,8 +447,8 @@ bool AfterLoadGame() @@
 		Waypoint *wp;
 		FOR_ALL_WAYPOINTS(wp) {
 			wp->name = CopyFromOldName(wp->string);
 			wp->string = STR_EMPTY;
 			wp->name = CopyFromOldName(wp->string_id);
 			wp->string_id = STR_NULL;
+		}
+	}
@@ @@ -1005,7 +1005,7 @@ bool AfterLoadGame() @@
 		Waypoint *wp;
 		FOR_ALL_WAYPOINTS(wp) {
-			if (wp->deleted == 0) {
+			if (wp->delete_ctr == 0) {
 				const StationSpec *statspec = NULL;
 				if (HasBit(_m[wp->xy].m3, 4))

src/saveload/waypoint_sl.cpp

➞

Show inline comments

@@ @@ -45,9 +45,9 @@ void FixOldWaypoints() @@
 	FOR_ALL_WAYPOINTS(wp) {
 		wp->town_index = ClosestTownFromTile(wp->xy, UINT_MAX)->index;
 		wp->town_cn = 0;
 		if (wp->string & 0xC000) {
 			wp->town_cn = wp->string & 0x3F;
 			wp->string = STR_NULL;
 		if (wp->string_id & 0xC000) {
 			wp->town_cn = wp->string_id & 0x3F;
 			wp->string_id = STR_NULL;
+		}
+	}
+}
@@ @@ -58,9 +58,9 @@ static const SaveLoad _waypoint_desc[] = @@
 	SLE_CONDVAR(Waypoint, town_index, SLE_UINT16,                 12, SL_MAX_VERSION),
 	SLE_CONDVAR(Waypoint, town_cn,    SLE_FILE_U8 | SLE_VAR_U16,  12, 88),
 	SLE_CONDVAR(Waypoint, town_cn,    SLE_UINT16,                 89, SL_MAX_VERSION),
-	SLE_CONDVAR(Waypoint, string,     SLE_STRINGID,                0, 83),
+	SLE_CONDVAR(Waypoint, string_id,  SLE_STRINGID,                0, 83),
 	SLE_CONDSTR(Waypoint, name,       SLE_STR, 0,                 84, SL_MAX_VERSION),
-	    SLE_VAR(Waypoint, deleted,    SLE_UINT8),
+	    SLE_VAR(Waypoint, delete_ctr, SLE_UINT8),
 	SLE_CONDVAR(Waypoint, build_date, SLE_FILE_U16 | SLE_VAR_I32,  3, 30),
 	SLE_CONDVAR(Waypoint, build_date, SLE_INT32,                  31, SL_MAX_VERSION),

src/viewport.cpp

➞

Show inline comments

@@ @@ -1218,7 +1218,7 @@ static void ViewportAddSigns(DrawPixelIn @@
 static void AddWaypoint(const Waypoint *wp, StringID str, uint16 width)
+{
-	AddStringToDraw(wp->sign.left + 1, wp->sign.top + 1, str, wp->index, 0, (wp->deleted ? 0xE : _company_colours[wp->owner]), width);
+	AddStringToDraw(wp->sign.left + 1, wp->sign.top + 1, str, wp->index, 0, (wp->delete_ctr != 0 ? 0xE : _company_colours[wp->owner]), width);
+}

src/waypoint.cpp

➞

Show inline comments

@@ @@ -38,7 +38,7 @@ void WaypointsDailyLoop() @@
 	/* Check if we need to delete a waypoint */
 	FOR_ALL_WAYPOINTS(wp) {
-		if (wp->deleted != 0 && --wp->deleted == 0) delete wp;
+		if (wp->delete_ctr != 0 && --wp->delete_ctr == 0) delete wp;
+	}
+}

src/waypoint.h

➞

Show inline comments

@@ @@ -22,7 +22,7 @@ struct Waypoint : WaypointPool::PoolItem @@
 	TownID town_index; ///< Town associated with the waypoint
 	uint16 town_cn;    ///< The Nth waypoint for this town (consecutive number)
-	StringID string;   ///< C000-C03F have special meaning in old games
+	StringID string_id;///< C000-C03F have special meaning in old games
 	char *name;        ///< Custom name. If not set, town + town_cn is used for naming
 	ViewportSign sign; ///< Dimensions of sign (not saved)
@@ @@ -33,7 +33,7 @@ struct Waypoint : WaypointPool::PoolItem @@
 	uint32 grfid;      ///< ID of GRF file
 	byte localidx;     ///< Index of station within GRF file
-	byte deleted;      ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted.
+	byte delete_ctr;   ///< Delete counter. If greater than 0 then it is decremented until it reaches 0; the waypoint is then is deleted.
 	Waypoint(TileIndex tile = INVALID_TILE) : xy(tile) { }
 	~Waypoint();

src/waypoint_cmd.cpp

➞

Show inline comments

@@ @@ -104,7 +104,7 @@ static Waypoint *FindDeletedWaypointClos @@
 	uint thres = 8;
 	FOR_ALL_WAYPOINTS(wp) {
-		if (wp->deleted && wp->owner == _current_company) {
+		if (wp->delete_ctr != 0 && wp->owner == _current_company) {
 			uint cur_dist = DistanceManhattan(tile, wp->xy);
 			if (cur_dist < thres) {
@@ @@ -205,7 +205,7 @@ CommandCost CmdBuildTrainWaypoint(TileIn @@
 			wp->localidx = 0;
+		}
-		wp->deleted = 0;
+		wp->delete_ctr = 0;
 		wp->build_date = _date;
 		if (wp->town_index == INVALID_TOWN) MakeDefaultWaypointName(wp);
@@ @@ -239,7 +239,7 @@ CommandCost RemoveTrainWaypoint(TileInde @@
 		Track track = GetRailWaypointTrack(tile);
 		wp = GetWaypointByTile(tile);
-		wp->deleted = 30; // let it live for this many days before we do the actual deletion.
+		wp->delete_ctr = 30; // let it live for this many days before we do the actual deletion.
 		wp->sign.MarkDirty();
 		Train *v = NULL;

0 comments (0 inline, 0 general)