mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-12 09:09:09 +00:00
Code Issues Activity

Codechange: Replaced SmallVector::Get() const with std alternatives

Browse Source
This commit is contained in:
Henry Wilson
2018-09-25 21:20:24 +01:00
committed by PeterN
parent aa7ca7fe64
commit 097328c3d7
11 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_engine.cpp
View File

@@ -1209,17 +1209,17 @@ void AlterVehicleListOrder(EngineID engine, uint target)
*/
static int CDECL EnginePreSort(const EngineID *a, const EngineID *b)
{
const EngineIDMapping *id_a = _engine_mngr.Get(*a);
const EngineIDMapping *id_b = _engine_mngr.Get(*b);
const EngineIDMapping &id_a = _engine_mngr.at(*a);
const EngineIDMapping &id_b = _engine_mngr.at(*b);
/* 1. Sort by engine type */
if (id_a->type != id_b->type) return (int)id_a->type - (int)id_b->type;
if (id_a.type != id_b.type) return (int)id_a.type - (int)id_b.type;
/* 2. Sort by scope-GRFID */
if (id_a->grfid != id_b->grfid) return id_a->grfid < id_b->grfid ? -1 : 1;
if (id_a.grfid != id_b.grfid) return id_a.grfid < id_b.grfid ? -1 : 1;
/* 3. Sort by local ID */
return (int)id_a->internal_id - (int)id_b->internal_id;
return (int)id_a.internal_id - (int)id_b.internal_id;
}
/**
@@ -1241,7 +1241,7 @@ void CommitVehicleListOrderChanges()
EngineID source = it->engine;
uint local_target = it->target;
const EngineIDMapping *id_source = _engine_mngr.Get(source);
const EngineIDMapping *id_source = _engine_mngr.data() + source;
if (id_source->internal_id == local_target) continue;
EngineID target = _engine_mngr.GetID(id_source->type, local_target, id_source->grfid);