diff options
author | smatz <smatz@openttd.org> | 2009-07-01 18:45:05 +0000 |
---|---|---|
committer | smatz <smatz@openttd.org> | 2009-07-01 18:45:05 +0000 |
commit | 76a50ce94dc7c78d76c309d8a639591fed2a2da8 (patch) | |
tree | 342be7030b9760781f886bca89cbe01863985008 /src/saveload | |
parent | aaeb53066dff98cac2d66d1f02f545d14c9f650c (diff) | |
download | openttd-76a50ce94dc7c78d76c309d8a639591fed2a2da8.tar.xz |
(svn r16714) -Codechange: use pool-like accessors for Subsidy
Diffstat (limited to 'src/saveload')
-rw-r--r-- | src/saveload/afterload.cpp | 2 | ||||
-rw-r--r-- | src/saveload/oldloader_sl.cpp | 4 | ||||
-rw-r--r-- | src/saveload/subsidy_sl.cpp | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 28c5cd525..c5534ddae 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -31,7 +31,7 @@ #include "../town.h" #include "../economy_base.h" #include "../animated_tile_func.h" -#include "../subsidy_type.h" +#include "../subsidy_base.h" #include "table/strings.h" diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 6c50eb05f..fceb86df0 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -12,7 +12,7 @@ #include "../train.h" #include "../signs_base.h" #include "../station_base.h" -#include "../subsidy_type.h" +#include "../subsidy_base.h" #include "../debug.h" #include "../depot_base.h" #include "../newgrf_config.h" @@ -1475,7 +1475,7 @@ static const OldChunks subsidy_chunk[] = { static bool LoadOldSubsidy(LoadgameState *ls, int num) { - return LoadChunk(ls, &_subsidies[num], subsidy_chunk); + return LoadChunk(ls, &Subsidy::array[num], subsidy_chunk); } static const OldChunks game_difficulty_chunk[] = { diff --git a/src/saveload/subsidy_sl.cpp b/src/saveload/subsidy_sl.cpp index 7e59a80e3..f7b6a8f12 100644 --- a/src/saveload/subsidy_sl.cpp +++ b/src/saveload/subsidy_sl.cpp @@ -3,7 +3,7 @@ /** @file subsidy_sl.cpp Code handling saving and loading of subsidies */ #include "../stdafx.h" -#include "../subsidy_type.h" +#include "../subsidy_base.h" #include "saveload.h" @@ -21,7 +21,7 @@ void Save_SUBS() { Subsidy *s; FOR_ALL_SUBSIDIES(s) { - SlSetArrayIndex(s - _subsidies); + SlSetArrayIndex(s->Index()); SlObject(s, _subsidies_desc); } } @@ -29,8 +29,9 @@ void Save_SUBS() void Load_SUBS() { int index; - while ((index = SlIterateArray()) != -1) - SlObject(&_subsidies[index], _subsidies_desc); + while ((index = SlIterateArray()) != -1) { + SlObject(&Subsidy::array[index], _subsidies_desc); + } } extern const ChunkHandler _subsidy_chunk_handlers[] = { |