diff options
| author | rubidium <rubidium@openttd.org> | 2010-08-11 18:50:23 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2010-08-11 18:50:23 +0000 |
| commit | e0a3a0fd54cff08f8d721dded1dc9651296de1d2 (patch) | |
| tree | 1533e35e734dde48a461330c6325c09fbd07c1c8 | |
| parent | 6b4f36533c2866eec9a8ff72a9b2f4694c713fc8 (diff) | |
| download | openttd-e0a3a0fd54cff08f8d721dded1dc9651296de1d2.tar.xz | |
(svn r20448) -Codechange: make some functions that can be const const
| -rw-r--r-- | src/newgrf_commons.cpp | 6 | ||||
| -rw-r--r-- | src/newgrf_commons.h | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp index a169b17e4..b3982c557 100644 --- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -92,7 +92,7 @@ void OverrideManagerBase::ResetOverride() * @param grfid ID of the grf file * @return the ID of the candidate, of the Invalid flag item ID */ -uint16 OverrideManagerBase::GetID(uint8 grf_local_id, uint32 grfid) +uint16 OverrideManagerBase::GetID(uint8 grf_local_id, uint32 grfid) const { const EntityIDMapping *map; @@ -146,7 +146,7 @@ uint16 OverrideManagerBase::AddEntityID(byte grf_local_id, uint32 grfid, byte su * @param entity_id of the entity being queried * @return mapped id */ -uint16 OverrideManagerBase::GetSubstituteID(uint16 entity_id) +uint16 OverrideManagerBase::GetSubstituteID(uint16 entity_id) const { return mapping_ID[entity_id].substitute_id; } @@ -185,7 +185,7 @@ void HouseOverrideManager::SetEntitySpec(const HouseSpec *hs) * @param grfid ID of the grf file * @return the ID of the candidate, of the Invalid flag item ID */ -uint16 IndustryOverrideManager::GetID(uint8 grf_local_id, uint32 grfid) +uint16 IndustryOverrideManager::GetID(uint8 grf_local_id, uint32 grfid) const { uint16 id = OverrideManagerBase::GetID(grf_local_id, grfid); if (id != invalid_ID) return id; diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h index 665d64dd6..2771926d9 100644 --- a/src/newgrf_commons.h +++ b/src/newgrf_commons.h @@ -65,11 +65,11 @@ public: void Add(uint8 local_id, uint32 grfid, uint entity_type); virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id); - uint16 GetSubstituteID(uint16 entity_id); - virtual uint16 GetID(uint8 grf_local_id, uint32 grfid); + uint16 GetSubstituteID(uint16 entity_id) const; + virtual uint16 GetID(uint8 grf_local_id, uint32 grfid) const; - inline uint16 GetMaxMapping() { return max_new_entities; } - inline uint16 GetMaxOffset() { return max_offset; } + inline uint16 GetMaxMapping() const { return max_new_entities; } + inline uint16 GetMaxOffset() const { return max_offset; } }; @@ -89,7 +89,7 @@ public: OverrideManagerBase(offset, maximum, invalid) {} virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id); - virtual uint16 GetID(uint8 grf_local_id, uint32 grfid); + virtual uint16 GetID(uint8 grf_local_id, uint32 grfid) const; void SetEntitySpec(IndustrySpec *inds); }; |