mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r10688) -Cleanup: coding style cleanups missed in the last few cleanups.
This commit is contained in:
parent
669f879632
commit
5833ceb5a2
|
@ -25,8 +25,7 @@ struct EntityIDMapping {
|
||||||
uint8 substitute_id; ///< The (original) entity ID to use if this GRF is not available
|
uint8 substitute_id; ///< The (original) entity ID to use if this GRF is not available
|
||||||
};
|
};
|
||||||
|
|
||||||
class OverrideManagerBase
|
class OverrideManagerBase {
|
||||||
{
|
|
||||||
protected:
|
protected:
|
||||||
uint16 *entity_overrides;
|
uint16 *entity_overrides;
|
||||||
|
|
||||||
|
@ -50,40 +49,38 @@ public:
|
||||||
uint16 GetSubstituteID(byte entity_id);
|
uint16 GetSubstituteID(byte entity_id);
|
||||||
uint16 GetID(uint8 grf_local_id, uint32 grfid);
|
uint16 GetID(uint8 grf_local_id, uint32 grfid);
|
||||||
|
|
||||||
inline uint16 GetMaxMapping() { return max_new_entities; };
|
inline uint16 GetMaxMapping() { return max_new_entities; }
|
||||||
inline uint16 GetMaxOffset() { return max_offset; };
|
inline uint16 GetMaxOffset() { return max_offset; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
struct HouseSpec;
|
struct HouseSpec;
|
||||||
class HouseOverrideManager : public OverrideManagerBase
|
class HouseOverrideManager : public OverrideManagerBase {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
HouseOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
|
HouseOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
|
||||||
OverrideManagerBase(offset, maximum, invalid) {};
|
OverrideManagerBase(offset, maximum, invalid) {}
|
||||||
void SetEntitySpec(const HouseSpec *hs);
|
void SetEntitySpec(const HouseSpec *hs);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
struct IndustrySpec;
|
struct IndustrySpec;
|
||||||
class IndustryOverrideManager : public OverrideManagerBase
|
class IndustryOverrideManager : public OverrideManagerBase {
|
||||||
{
|
public:
|
||||||
public:
|
IndustryOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
|
||||||
IndustryOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
|
OverrideManagerBase(offset, maximum, invalid) {}
|
||||||
OverrideManagerBase(offset, maximum, invalid) {};
|
|
||||||
|
|
||||||
virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id);
|
virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id);
|
||||||
void SetEntitySpec(const IndustrySpec *inds);
|
void SetEntitySpec(const IndustrySpec *inds);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
struct IndustryTileSpec;
|
struct IndustryTileSpec;
|
||||||
class IndustryTileOverrideManager : public OverrideManagerBase
|
class IndustryTileOverrideManager : public OverrideManagerBase {
|
||||||
{
|
public:
|
||||||
public:
|
IndustryTileOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
|
||||||
IndustryTileOverrideManager(uint16 offset, uint16 maximum, uint16 invalid) :
|
OverrideManagerBase(offset, maximum, invalid) {}
|
||||||
OverrideManagerBase(offset, maximum, invalid) {};
|
|
||||||
void SetEntitySpec(const IndustryTileSpec *indts);
|
void SetEntitySpec(const IndustryTileSpec *indts);
|
||||||
};
|
};
|
||||||
|
|
||||||
extern HouseOverrideManager _house_mngr;
|
extern HouseOverrideManager _house_mngr;
|
||||||
|
|
Loading…
Reference in New Issue