diff options
author | rubidium <rubidium@openttd.org> | 2010-08-10 15:54:53 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2010-08-10 15:54:53 +0000 |
commit | 29b489a055e12033b006410d5e67a493c64ccfe2 (patch) | |
tree | a0e8bee3d26a69341484ffe0461819e98fe1bf6f /src/engine_base.h | |
parent | 3d21fb44aae10d627cf24c7e42485c8f3a33ed42 (diff) | |
download | openttd-29b489a055e12033b006410d5e67a493c64ccfe2.tar.xz |
(svn r20437) -Codechange: lets Engines use GRFFilePropsBase as well
Diffstat (limited to 'src/engine_base.h')
-rw-r--r-- | src/engine_base.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/engine_base.h b/src/engine_base.h index c7e3823d5..ac6fa1d22 100644 --- a/src/engine_base.h +++ b/src/engine_base.h @@ -17,6 +17,7 @@ #include "vehicle_type.h" #include "core/pool_type.hpp" #include "core/smallvec_type.hpp" +#include "newgrf_commons.h" typedef Pool<Engine, EngineID, 64, 64000> EnginePool; extern EnginePool _engine_pool; @@ -46,9 +47,13 @@ struct Engine : EnginePool::PoolItem<&_engine_pool> { } u; /* NewGRF related data */ - const struct GRFFile *grffile; - const struct SpriteGroup *group[NUM_CARGO + 2]; - uint16 internal_id; ///< ID within the GRF file + /** + * Properties related the the grf file. + * NUM_CARGO real cargo plus two pseudo cargo sprite groups. + * Used for obtaining the sprite offset of custom sprites, and for + * evaluating callbacks. + */ + GRFFilePropsBase<NUM_CARGO + 2> grf_prop; uint16 overrides_count; struct WagonOverride *overrides; uint16 list_position; |