diff options
author | frosch <frosch@openttd.org> | 2012-08-18 11:38:06 +0000 |
---|---|---|
committer | frosch <frosch@openttd.org> | 2012-08-18 11:38:06 +0000 |
commit | b11b0bb0e2b106be1a6534cb01008efbab2364dd (patch) | |
tree | 28a1092f71a9c4db2fb59fb6dc15fe572a07acc4 | |
parent | d17ec934f55f5000cf30aa752437cc48cff19645 (diff) | |
download | openttd-b11b0bb0e2b106be1a6534cb01008efbab2364dd.tar.xz |
(svn r24482) -Fix [FS#5232] (r24180): Do not call RebuildSubsidisedSourceAndDestinationCache() before subsidy savegame conversion is finished.
-rw-r--r-- | src/openttd.cpp | 3 | ||||
-rw-r--r-- | src/saveload/town_sl.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/openttd.cpp b/src/openttd.cpp index 602f314c9..0661334d6 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -60,7 +60,7 @@ #include "game/game.hpp" #include "game/game_config.hpp" #include "town.h" - +#include "subsidy_func.h" #include <stdarg.h> @@ -1158,6 +1158,7 @@ static void CheckCaches() extern void RebuildTownCaches(); RebuildTownCaches(); + RebuildSubsidisedSourceAndDestinationCache(); uint i = 0; FOR_ALL_TOWNS(t) { diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp index 96cf87ada..c0cb59994 100644 --- a/src/saveload/town_sl.cpp +++ b/src/saveload/town_sl.cpp @@ -50,8 +50,6 @@ void RebuildTownCaches() UpdateTownCargoes(town); } UpdateTownCargoBitmap(); - - RebuildSubsidisedSourceAndDestinationCache(); } /** |