cpp/openttd-patchpack/source Changeset - r12283:f18ea66eda09

Changeset - r12283:f18ea66eda09

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

smatz - 15 years ago 2009-07-01 15:08:43
smatz@openttd.org

(svn r16710) -Fix: invalidate subsidies with invalid source or destination when converting older savegames

1 file changed with 31 insertions and 0 deletions:

src/saveload/afterload.cpp

0 comments (0 inline, 0 general)

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -31,6 +31,7 @@ @@
 #include "../town.h"
 #include "../economy_base.h"
 #include "../animated_tile_func.h"
 #include "../subsidy_type.h"
 #include "table/strings.h"
@@ @@ -1913,6 +1914,36 @@ bool AfterLoadGame() @@
 				i++;
+			}
+		}
 		/* Delete invalid subsidies possibly present in old versions (but converted to new savegame) */
 		for (Subsidy *s = _subsidies; s < endof(_subsidies); s++) {
 			if (s->cargo_type == CT_INVALID) continue;
 			if (s->age >= 12) {
 				/* Station -> Station */
 				const Station *from = Station::GetIfValid(s->from);
 				const Station *to = Station::GetIfValid(s->to);
 				if (from != NULL && to != NULL && from->owner == to->owner && Company::IsValidID(from->owner)) continue;
 			} else {
 				const CargoSpec *cs = GetCargo(s->cargo_type);
 				switch (cs->town_effect) {
 					case TE_PASSENGERS:
 					case TE_MAIL:
 						/* Town -> Town */
 						if (Town::IsValidID(s->from) && Town::IsValidID(s->to)) continue;
 						break;
 					case TE_GOODS:
 					case TE_FOOD:
 						/* Industry -> Town */
 						if (Industry::IsValidID(s->from) && Town::IsValidID(s->to)) continue;
 						break;
 					default:
 						/* Industry -> Industry */
 						if (Industry::IsValidID(s->from) && Industry::IsValidID(s->to)) continue;
 						break;
+				}
+			}
 			s->cargo_type = CT_INVALID;
+		}
+	}
 	AfterLoadLabelMaps();

0 comments (0 inline, 0 general)