cpp/openttd-patchpack/source Changeset - r23963:b6586baea514

Changeset - r23963:b6586baea514

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

glx - 5 years ago 2019-12-16 18:28:46
glx@openttd.org

Codechange: Replace linkgraph related FOR_ALL with range-based for loops

5 files changed with 8 insertions and 19 deletions:

src/date.cpp

src/linkgraph/linkgraph.h

src/linkgraph/linkgraphjob.h

src/linkgraph/linkgraphschedule.cpp

src/saveload/linkgraph_sl.cpp

0 comments (0 inline, 0 general)

src/date.cpp

➞

Show inline comments

@@ @@ -210,8 +210,7 @@ static void OnNewYear() @@
 		_date -= days_this_year;
 		FOR_ALL_VEHICLES(v) v->date_of_last_service -= days_this_year;
 		LinkGraph *lg;
 		FOR_ALL_LINK_GRAPHS(lg) lg->ShiftDates(-days_this_year);
 		for (LinkGraph *lg : LinkGraph::Iterate()) lg->ShiftDates(-days_this_year);
 		/* Because the _date wraps here, and text-messages expire by game-days, we have to clean out
 		 *  all of them if the date is set back, else those messages will hang for ever */

src/linkgraph/linkgraph.h

➞

Show inline comments

@@ @@ -534,6 +534,4 @@ protected: @@
 	EdgeMatrix edges;      ///< Edges in the component.
 };
 #define FOR_ALL_LINK_GRAPHS(var) FOR_ALL_ITEMS_FROM(LinkGraph, link_graph_index, var, 0)
 #endif /* LINKGRAPH_H */

src/linkgraph/linkgraphjob.h

➞

Show inline comments

@@ @@ -334,8 +334,6 @@ public: @@
 	inline const LinkGraph &Graph() const { return this->link_graph; }
 };
 #define FOR_ALL_LINK_GRAPH_JOBS(var) FOR_ALL_ITEMS_FROM(LinkGraphJob, link_graph_job_index, var, 0)
 /**
  * A leg of a path in the link graph. Paths can form trees by being "forked".
  */

src/linkgraph/linkgraphschedule.cpp

➞

Show inline comments

@@ @@ -107,10 +107,8 @@ void LinkGraphSchedule::SpawnAll() @@
  */
 void LinkGraphSchedule::ShiftDates(int interval)
+{
 	LinkGraph *lg;
 	FOR_ALL_LINK_GRAPHS(lg) lg->ShiftDates(interval);
 	LinkGraphJob *lgj;
 	FOR_ALL_LINK_GRAPH_JOBS(lgj) lgj->ShiftJoinDate(interval);
 	for (LinkGraph *lg : LinkGraph::Iterate()) lg->ShiftDates(interval);
 	for (LinkGraphJob *lgj : LinkGraphJob::Iterate()) lgj->ShiftJoinDate(interval);
+}
 /**

src/saveload/linkgraph_sl.cpp

➞

Show inline comments

@@ @@ -228,17 +228,15 @@ static void Load_LGRS() @@
 void AfterLoadLinkGraphs()
+{
 	if (IsSavegameVersionBefore(SLV_191)) {
 		LinkGraph *lg;
 		FOR_ALL_LINK_GRAPHS(lg) {
 		for (LinkGraph *lg : LinkGraph::Iterate()) {
 			for (NodeID node_id = 0; node_id < lg->Size(); ++node_id) {
 				const Station *st = Station::GetIfValid((*lg)[node_id].Station());
 				if (st != nullptr) (*lg)[node_id].UpdateLocation(st->xy);
+			}
+		}
 		LinkGraphJob *lgj;
 		FOR_ALL_LINK_GRAPH_JOBS(lgj) {
 			lg = &(const_cast<LinkGraph &>(lgj->Graph()));
 		for (LinkGraphJob *lgj : LinkGraphJob::Iterate()) {
 			LinkGraph *lg = &(const_cast<LinkGraph &>(lgj->Graph()));
 			for (NodeID node_id = 0; node_id < lg->Size(); ++node_id) {
 				const Station *st = Station::GetIfValid((*lg)[node_id].Station());
 				if (st != nullptr) (*lg)[node_id].UpdateLocation(st->xy);
@@ @@ -254,8 +252,7 @@ void AfterLoadLinkGraphs() @@
  */
 static void Save_LGRP()
+{
 	LinkGraph *lg;
 	FOR_ALL_LINK_GRAPHS(lg) {
 	for (LinkGraph *lg : LinkGraph::Iterate()) {
 		SlSetArrayIndex(lg->index);
 		SlAutolength((AutolengthProc*)DoSave_LGRP, lg);
+	}
@@ @@ -266,8 +263,7 @@ static void Save_LGRP() @@
  */
 static void Save_LGRJ()
+{
 	LinkGraphJob *lgj;
 	FOR_ALL_LINK_GRAPH_JOBS(lgj) {
 	for (LinkGraphJob *lgj : LinkGraphJob::Iterate()) {
 		SlSetArrayIndex(lgj->index);
 		SlAutolength((AutolengthProc*)DoSave_LGRJ, lgj);
+	}

0 comments (0 inline, 0 general)