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

(svn r6837) - Codechange: More const SpriteGroups missed in r6836

release/0.5
peter1138 2006-10-19 10:40:21 +00:00
parent 81d41b8d57
commit 45fa2a12fd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
newgrf.c
View File

@ -1395,7 +1395,7 @@ static void FeatureChangeInfo(byte *buf, int len)
* @param value The value that was used to represent this callback result * @param value The value that was used to represent this callback result
* @return A spritegroup representing that callback result * @return A spritegroup representing that callback result
*/ */
static SpriteGroup* NewCallBackResultSpriteGroup(uint16 value) static const SpriteGroup* NewCallBackResultSpriteGroup(uint16 value)
{ {
SpriteGroup *group = AllocateSpriteGroup(); SpriteGroup *group = AllocateSpriteGroup();
@ -1420,7 +1420,7 @@ static SpriteGroup* NewCallBackResultSpriteGroup(uint16 value)
* @param sprites The number of sprites per set. * @param sprites The number of sprites per set.
* @return A spritegroup representing the sprite number result. * @return A spritegroup representing the sprite number result.
*/ */
static SpriteGroup* NewResultSpriteGroup(SpriteID sprite, byte num_sprites) static const SpriteGroup* NewResultSpriteGroup(SpriteID sprite, byte num_sprites)
{ {
SpriteGroup *group = AllocateSpriteGroup(); SpriteGroup *group = AllocateSpriteGroup();
group->type = SGT_RESULT; group->type = SGT_RESULT;
@ -1475,7 +1475,7 @@ static void NewSpriteSet(byte *buf, int len)
/* Helper function to either create a callback or link to a previously /* Helper function to either create a callback or link to a previously
* defined spritegroup. */ * defined spritegroup. */
static SpriteGroup* GetGroupFromGroupID(byte setid, byte type, uint16 groupid) static const SpriteGroup* GetGroupFromGroupID(byte setid, byte type, uint16 groupid)
{ {
if (HASBIT(groupid, 15)) return NewCallBackResultSpriteGroup(groupid); if (HASBIT(groupid, 15)) return NewCallBackResultSpriteGroup(groupid);
@ -1488,7 +1488,7 @@ static SpriteGroup* GetGroupFromGroupID(byte setid, byte type, uint16 groupid)
} }
/* Helper function to either create a callback or a result sprite group. */ /* Helper function to either create a callback or a result sprite group. */
static SpriteGroup* CreateGroupFromGroupID(byte feature, byte setid, byte type, uint16 spriteid, uint16 num_sprites) static const SpriteGroup* CreateGroupFromGroupID(byte feature, byte setid, byte type, uint16 spriteid, uint16 num_sprites)
{ {
if (HASBIT(spriteid, 15)) return NewCallBackResultSpriteGroup(spriteid); if (HASBIT(spriteid, 15)) return NewCallBackResultSpriteGroup(spriteid);

2
newgrf_station.h
View File

@ -73,7 +73,7 @@ typedef struct StationSpec {
* Used for obtaining the sprite offset of custom sprites, and for * Used for obtaining the sprite offset of custom sprites, and for
* evaluating callbacks. * evaluating callbacks.
*/ */
struct SpriteGroup *spritegroup[NUM_GLOBAL_CID]; const struct SpriteGroup *spritegroup[NUM_GLOBAL_CID];
} StationSpec; } StationSpec;
/** /**