# HG changeset patch # User rubidium # Date 1281552623 0 # Node ID 400e8473b89ee41abbeba96043725ff7bb1b6ce4 # Parent e972d8a55e272181c2724fd0377c87d331dd2498 (svn r20448) -Codechange: make some functions that can be const const diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp --- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -92,7 +92,7 @@ * @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 @@ * @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 @@ * @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 --- a/src/newgrf_commons.h +++ b/src/newgrf_commons.h @@ -65,11 +65,11 @@ 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 @@ 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); };