diff options
| author | frosch <frosch@openttd.org> | 2011-10-03 17:19:54 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2011-10-03 17:19:54 +0000 |
| commit | 7133887ed66a55527037b2c314cf3dfb048e10cd (patch) | |
| tree | 4184fad7e343ae3e0014ad1c740a86697b206ad9 | |
| parent | decf5c67ea21be023ca85d5e2ce66b6ffb06d45f (diff) | |
| download | openttd-7133887ed66a55527037b2c314cf3dfb048e10cd.tar.xz | |
(svn r22975) -Codechange: Do not store Group::num_vehicle in the savegame, but compute it like num_engines on load.
| -rw-r--r-- | src/engine.cpp | 2 | ||||
| -rw-r--r-- | src/saveload/group_sl.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/engine.cpp b/src/engine.cpp index 05bbc9113..4e212640e 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -477,6 +477,7 @@ void SetCachedEngineCounts() /* Recalculate */ Group *g; FOR_ALL_GROUPS(g) { + g->num_vehicle = 0; free(g->num_engines); g->num_engines = CallocT<EngineID>(engines); } @@ -496,6 +497,7 @@ void SetCachedEngineCounts() assert(v->owner == g->owner); g->num_engines[v->engine_type]++; + if (v->IsPrimaryVehicle()) g->num_vehicle++; } } diff --git a/src/saveload/group_sl.cpp b/src/saveload/group_sl.cpp index f1620a968..ec05d7280 100644 --- a/src/saveload/group_sl.cpp +++ b/src/saveload/group_sl.cpp @@ -17,7 +17,7 @@ static const SaveLoad _group_desc[] = { SLE_CONDVAR(Group, name, SLE_NAME, 0, 83), SLE_CONDSTR(Group, name, SLE_STR, 0, 84, SL_MAX_VERSION), - SLE_VAR(Group, num_vehicle, SLE_UINT16), + SLE_CONDNULL(2, 0, 163), // num_vehicle SLE_VAR(Group, owner, SLE_UINT8), SLE_VAR(Group, vehicle_type, SLE_UINT8), SLE_VAR(Group, replace_protection, SLE_BOOL), |