mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r22975) -Codechange: Do not store Group::num_vehicle in the savegame, but compute it like num_engines on load.

release/1.2
frosch 2011-10-03 17:19:54 +00:00
parent decf5c67ea
commit 7133887ed6
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine.cpp
View File

@ -477,6 +477,7 @@ void SetCachedEngineCounts()
/* Recalculate */ /* Recalculate */
Group *g; Group *g;
FOR_ALL_GROUPS(g) { FOR_ALL_GROUPS(g) {
g->num_vehicle = 0;
free(g->num_engines); free(g->num_engines);
g->num_engines = CallocT<EngineID>(engines); g->num_engines = CallocT<EngineID>(engines);
} }
@ -496,6 +497,7 @@ void SetCachedEngineCounts()
assert(v->owner == g->owner); assert(v->owner == g->owner);
g->num_engines[v->engine_type]++; g->num_engines[v->engine_type]++;
if (v->IsPrimaryVehicle()) g->num_vehicle++;
} }
} }

2
src/saveload/group_sl.cpp
View File

@ -17,7 +17,7 @@
static const SaveLoad _group_desc[] = { static const SaveLoad _group_desc[] = {
SLE_CONDVAR(Group, name, SLE_NAME, 0, 83), SLE_CONDVAR(Group, name, SLE_NAME, 0, 83),
SLE_CONDSTR(Group, name, SLE_STR, 0, 84, SL_MAX_VERSION), 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, owner, SLE_UINT8),
SLE_VAR(Group, vehicle_type, SLE_UINT8), SLE_VAR(Group, vehicle_type, SLE_UINT8),
SLE_VAR(Group, replace_protection, SLE_BOOL), SLE_VAR(Group, replace_protection, SLE_BOOL),