cpp/openttd-patchpack/source Changeset - r23956:102d2d7daf23

Changeset - r23956:102d2d7daf23

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

glx - 4 years ago 2019-12-15 16:37:35
glx@openttd.org

Codechange: Replace FOR_ALL_CARGOPACKETS with range-based for loops

3 files changed with 4 insertions and 22 deletions:

src/cargopacket.cpp

src/cargopacket.h

src/saveload/cargopacket_sl.cpp

0 comments (0 inline, 0 general)

src/cargopacket.cpp

➞

Show inline comments

@@ @@ -126,8 +126,7 @@ void CargoPacket::Reduce(uint count) @@
  */
 /* static */ void CargoPacket::InvalidateAllFrom(SourceType src_type, SourceID src)
+{
 	CargoPacket *cp;
 	FOR_ALL_CARGOPACKETS(cp) {
 	for (CargoPacket *cp : CargoPacket::Iterate()) {
 		if (cp->source_type == src_type && cp->source_id == src) cp->source_id = INVALID_SOURCE;
+	}
+}
@@ @@ -138,8 +137,7 @@ void CargoPacket::Reduce(uint count) @@
  */
 /* static */ void CargoPacket::InvalidateAllFrom(StationID sid)
+{
 	CargoPacket *cp;
 	FOR_ALL_CARGOPACKETS(cp) {
 	for (CargoPacket *cp : CargoPacket::Iterate()) {
 		if (cp->source == sid) cp->source = INVALID_STATION;
+	}
+}

src/cargopacket.h

➞

Show inline comments

@@ @@ -193,19 +193,6 @@ public: @@
 };
 /**
  * Iterate over all _valid_ cargo packets from the given start.
  * @param var   Variable used as "iterator".
  * @param start Cargo packet ID of the first packet to iterate over.
  */
 #define FOR_ALL_CARGOPACKETS_FROM(var, start) FOR_ALL_ITEMS_FROM(CargoPacket, cargopacket_index, var, start)
 /**
  * Iterate over all _valid_ cargo packets from the begin of the pool.
  * @param var   Variable used as "iterator".
  */
 #define FOR_ALL_CARGOPACKETS(var) FOR_ALL_CARGOPACKETS_FROM(var, 0)
 /**
  * Simple collection class for a list of cargo packets.
  * @tparam Tinst Actual instantiation of this cargo list.
  */

src/saveload/cargopacket_sl.cpp

➞

Show inline comments

@@ @@ -58,8 +58,7 @@ @@
 	if (IsSavegameVersionBefore(SLV_120)) {
 		/* CargoPacket's source should be either INVALID_STATION or a valid station */
 		CargoPacket *cp;
 		FOR_ALL_CARGOPACKETS(cp) {
 		for (CargoPacket *cp : CargoPacket::Iterate()) {
 			if (!Station::IsValidID(cp->source)) cp->source = INVALID_STATION;
+		}
+	}
@@ @@ -112,9 +111,7 @@ const SaveLoad *GetCargoPacketDesc() @@
  */
 static void Save_CAPA()
+{
 	CargoPacket *cp;
 	FOR_ALL_CARGOPACKETS(cp) {
 	for (CargoPacket *cp : CargoPacket::Iterate()) {
 		SlSetArrayIndex(cp->index);
 		SlObject(cp, GetCargoPacketDesc());
+	}

0 comments (0 inline, 0 general)