Mercurial > hg > openttd
changeset 4807:280259cad5ad draft
(svn r6729) -Fix r6707: [build aircraft window] solved a crash when using a grf set with a buildable helicopter with a lower EngineID than the first buildable plane
Also removed a lot of const cast as they mess up the code and didn't help much
| author | bjarni <bjarni@openttd.org> |
|---|---|
| date | Tue, 10 Oct 2006 20:11:48 +0000 |
| parents | 04002cb8932c |
| children | d9f8e55c43c0 |
| files | build_vehicle_gui.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/build_vehicle_gui.c +++ b/build_vehicle_gui.c @@ -286,7 +286,7 @@ } } -static inline void ExtendEngineListSize(const EngineID **engine_list, uint16 *engine_list_length, uint16 step_size, uint16 max) +static inline void ExtendEngineListSize(EngineID **engine_list, uint16 *engine_list_length, uint16 step_size, uint16 max) { *engine_list_length = min(*engine_list_length + step_size, max); *engine_list = realloc((void*)*engine_list, (*engine_list_length) * sizeof((*engine_list)[0])); @@ -310,17 +310,17 @@ switch (avi->subtype) { case AIR_CTOL: // Propeller planes - if (*num_planes == plane_length) ExtendEngineListSize((const EngineID**)planes, &plane_length, 5, NUM_AIRCRAFT_ENGINES); + if (*num_planes == plane_length) ExtendEngineListSize(planes, &plane_length, 5, NUM_AIRCRAFT_ENGINES); (*planes)[(*num_planes)++] = eid; break; case (AIR_CTOL | AIR_FAST): // Jet planes - if (*num_jets == jet_length) ExtendEngineListSize((const EngineID**)jets, &jet_length, 5, NUM_AIRCRAFT_ENGINES); + if (*num_jets == jet_length) ExtendEngineListSize(jets, &jet_length, 5, NUM_AIRCRAFT_ENGINES); (*jets)[(*num_jets)++] = eid; break; case 0: // Helicopters - if (*num_helicopters == helicopter_length) ExtendEngineListSize((const EngineID**)helicopters, &plane_length, 5, NUM_AIRCRAFT_ENGINES); + if (*num_helicopters == helicopter_length) ExtendEngineListSize(helicopters, &helicopter_length, 5, NUM_AIRCRAFT_ENGINES); (*helicopters)[(*num_helicopters)++] = eid; break; }