Mercurial > hg > openttd
changeset 9672:28e252610709 draft
(svn r13761) -Codechange: Remove dependency on rail for altering purchase list position (mostly function renaming)
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Sun, 20 Jul 2008 21:23:28 +0000 |
| parents | 1c964ab9af14 |
| children | addfe29f538c |
| files | src/newgrf.cpp src/newgrf_engine.cpp src/newgrf_engine.h |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -584,7 +584,7 @@ } break; case 0x1A: // Alter purchase list sort order - AlterRailVehListOrder(e->index, grf_load_byte(&buf)); + AlterVehicleListOrder(e->index, grf_load_byte(&buf)); break; case 0x1B: // Powered wagons power bonus @@ -6002,7 +6002,7 @@ InitGRFTownGeneratorNames(); /* Run all queued vehicle list order changes */ - CommitRailVehListOrderChanges(); + CommitVehicleListOrderChanges(); /* Load old shore sprites in new position, if they were replaced by ActionA */ ActivateOldShore();
--- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -1093,7 +1093,7 @@ static std::list<ListOrderChange> _list_order_changes; -void AlterRailVehListOrder(EngineID engine, EngineID target) +void AlterVehicleListOrder(EngineID engine, EngineID target) { /* Add the list order change to a queue */ ListOrderChange loc; @@ -1102,7 +1102,7 @@ _list_order_changes.push_back(loc); } -void CommitRailVehListOrderChanges() +void CommitVehicleListOrderChanges() { /* List position to Engine map */ typedef std::map<uint16, Engine*> ListPositionMap; @@ -1120,7 +1120,7 @@ /* Populate map with current list positions */ Engine *e; - FOR_ALL_ENGINES_OF_TYPE(e, VEH_TRAIN) { + FOR_ALL_ENGINES_OF_TYPE(e, source_e->type) { if (!_settings_game.vehicle.dynamic_engines || e->grffile == source_e->grffile) { if (e->internal_id == target) target_e = e; lptr_map[e->list_position] = e;
--- a/src/newgrf_engine.h +++ b/src/newgrf_engine.h @@ -56,8 +56,8 @@ void UnloadWagonOverrides(Engine *e); uint ListPositionOfEngine(EngineID engine); -void AlterRailVehListOrder(EngineID engine, EngineID target); -void CommitRailVehListOrderChanges(); +void AlterVehicleListOrder(EngineID engine, EngineID target); +void CommitVehicleListOrderChanges(); EngineID GetNewEngineID(const GRFFile *file, VehicleType type, uint16 internal_id);