Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-09 19:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12932) -Fix [FS#1970]: Articulated engines ignored GRF engine overrides.

Browse Source
This commit is contained in:
peter1138 2008-04-30 17:42:08 +00:00
parent 4097d81323
commit 3e0b6199c4
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/articulated_vehicles.cpp
View File

@ -11,20 +11,6 @@
#include "newgrf_engine.h"
#include "vehicle_func.h"
static EngineID GetNewEngineID(const GRFFile *file, VehicleType type, uint16 internal_id)
{
const Engine *e = NULL;
FOR_ALL_ENGINES(e) {
if (e->grffile != file) continue;
if (e->type != type) continue;
if (e->internal_id != internal_id) continue;
return e->index;
}
return INVALID_ENGINE;
}
uint CountArticulatedParts(EngineID engine_type, bool purchase_window)
{
if (!HasBit(EngInfo(engine_type)->callbackmask, CBM_VEHICLE_ARTIC_ENGINE)) return 0;

22
src/newgrf.cpp
View File

@ -359,6 +359,28 @@ static Engine *GetNewEngine(const GRFFile *file, VehicleType type, uint16 intern
return e;
}
EngineID GetNewEngineID(const GRFFile *file, VehicleType type, uint16 internal_id)
{
extern uint32 GetNewGRFOverride(uint32 grfid);
const GRFFile *grf_match = NULL;
if (_patches.dynamic_engines) {
uint32 override = _grf_id_overrides[file->grfid];
if (override != 0) grf_match = GetFileByGRFID(override);
}
const Engine *e = NULL;
FOR_ALL_ENGINES(e) {
if (_patches.dynamic_engines && e->grffile != file && (grf_match == NULL || e->grffile != grf_match)) continue;
if (e->type != type) continue;
if (e->internal_id != internal_id) continue;
return e->index;
}
return INVALID_ENGINE;
}
/** Map the colour modifiers of TTDPatch to those that Open is using.
* @param grf_sprite pointer to the structure been modified
*/

2
src/newgrf_engine.h
View File

@ -59,4 +59,6 @@ uint ListPositionOfEngine(EngineID engine);
void AlterRailVehListOrder(EngineID engine, EngineID target);
void CommitRailVehListOrderChanges();
EngineID GetNewEngineID(const GRFFile *file, VehicleType type, uint16 internal_id);
#endif /* NEWGRF_ENGINE_H */