summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-10-19 10:40:21 +0000
committerpeter1138 <peter1138@openttd.org>2006-10-19 10:40:21 +0000
commit45fa2a12fd38c559ccb3d38178b77c16d4e4bd5e (patch)
treef47258316c9a664cd9316eed64f54e0c9337674f
parent81d41b8d578e2c2cabf198ecede702a38824b5a5 (diff)
downloadopenttd-45fa2a12fd38c559ccb3d38178b77c16d4e4bd5e.tar.xz
(svn r6837) - Codechange: More const SpriteGroups missed in r6836
-rw-r--r--newgrf.c8
-rw-r--r--newgrf_station.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/newgrf.c b/newgrf.c
index dfa1d764e..86914b630 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -1395,7 +1395,7 @@ static void FeatureChangeInfo(byte *buf, int len)
* @param value The value that was used to represent this callback result
* @return A spritegroup representing that callback result
*/
-static SpriteGroup* NewCallBackResultSpriteGroup(uint16 value)
+static const SpriteGroup* NewCallBackResultSpriteGroup(uint16 value)
{
SpriteGroup *group = AllocateSpriteGroup();
@@ -1420,7 +1420,7 @@ static SpriteGroup* NewCallBackResultSpriteGroup(uint16 value)
* @param sprites The number of sprites per set.
* @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();
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
* 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);
@@ -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. */
-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);
diff --git a/newgrf_station.h b/newgrf_station.h
index e624f9695..a5a45d9a0 100644
--- a/newgrf_station.h
+++ b/newgrf_station.h
@@ -73,7 +73,7 @@ typedef struct StationSpec {
* Used for obtaining the sprite offset of custom sprites, and for
* evaluating callbacks.
*/
- struct SpriteGroup *spritegroup[NUM_GLOBAL_CID];
+ const struct SpriteGroup *spritegroup[NUM_GLOBAL_CID];
} StationSpec;
/**