mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20448) -Codechange: make some functions that can be const const

release/1.1
rubidium 2010-08-11 18:50:23 +00:00
parent 6b4f36533c
commit e0a3a0fd54
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf_commons.cpp
View File

@ -92,7 +92,7 @@ void OverrideManagerBase::ResetOverride()
* @param grfid ID of the grf file * @param grfid ID of the grf file
* @return the ID of the candidate, of the Invalid flag item ID * @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; 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 * @param entity_id of the entity being queried
* @return mapped id * @return mapped id
*/ */
uint16 OverrideManagerBase::GetSubstituteID(uint16 entity_id) uint16 OverrideManagerBase::GetSubstituteID(uint16 entity_id) const
{ {
return mapping_ID[entity_id].substitute_id; return mapping_ID[entity_id].substitute_id;
} }
@ -185,7 +185,7 @@ void HouseOverrideManager::SetEntitySpec(const HouseSpec *hs)
* @param grfid ID of the grf file * @param grfid ID of the grf file
* @return the ID of the candidate, of the Invalid flag item ID * @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); uint16 id = OverrideManagerBase::GetID(grf_local_id, grfid);
if (id != invalid_ID) return id; if (id != invalid_ID) return id;

10
src/newgrf_commons.h
View File

@ -65,11 +65,11 @@ public:
void Add(uint8 local_id, uint32 grfid, uint entity_type); void Add(uint8 local_id, uint32 grfid, uint entity_type);
virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id); virtual uint16 AddEntityID(byte grf_local_id, uint32 grfid, byte substitute_id);
uint16 GetSubstituteID(uint16 entity_id); uint16 GetSubstituteID(uint16 entity_id) const;
virtual uint16 GetID(uint8 grf_local_id, uint32 grfid); virtual uint16 GetID(uint8 grf_local_id, uint32 grfid) const;
inline uint16 GetMaxMapping() { return max_new_entities; } inline uint16 GetMaxMapping() const { return max_new_entities; }
inline uint16 GetMaxOffset() { return max_offset; } inline uint16 GetMaxOffset() const { return max_offset; }
}; };
@ -89,7 +89,7 @@ public:
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);
virtual uint16 GetID(uint8 grf_local_id, uint32 grfid); virtual uint16 GetID(uint8 grf_local_id, uint32 grfid) const;
void SetEntitySpec(IndustrySpec *inds); void SetEntitySpec(IndustrySpec *inds);
}; };