summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-10-10 09:40:12 +0000
committerDarkvater <darkvater@openttd.org>2006-10-10 09:40:12 +0000
commit9c611b08483897b982eb684102abafa86e7fd65c (patch)
tree6136f741fb66436eade6c89f50d06dbea508f63a
parent3a94561f253e595b30e8ee50e511c19bb1da99f7 (diff)
downloadopenttd-9c611b08483897b982eb684102abafa86e7fd65c.tar.xz
(svn r6717) -Codechange: move OPENTTD_SPRITES_COUNT into table/sprites.h to use it from there.
-rw-r--r--gfxinit.c1
-rw-r--r--table/sprites.h3
2 files changed, 2 insertions, 2 deletions
diff --git a/gfxinit.c b/gfxinit.c
index 97e0c7cbd..ffd154855 100644
--- a/gfxinit.c
+++ b/gfxinit.c
@@ -265,7 +265,6 @@ static const SpriteID trg1idx[] = {
* the old sprite-count offset from SPR_OPENTTD_BASE. With this there is no
* correspondence of any kind with the ID's in the grf file, but results in
* a maximum use of sprite slots. */
-#define OPENTTD_SPRITES_COUNT 109
static const SpriteID _openttd_grf_indexes[] = {
SPR_IMG_AUTORAIL, SPR_CURSOR_WAYPOINT, // icons etc
134, 134, // euro symbol medium size
diff --git a/table/sprites.h b/table/sprites.h
index 67e31cecb..3af180442 100644
--- a/table/sprites.h
+++ b/table/sprites.h
@@ -48,6 +48,7 @@ enum Sprites {
SPR_ASCII_SPACE_BIG = 450,
/* Extra graphic spritenumbers */
+ OPENTTD_SPRITES_COUNT = 109, // number of gfx-sprites in openttd.grf
SPR_CANALS_BASE = 5382,
SPR_SLOPES_BASE = SPR_CANALS_BASE + 70,
SPR_AUTORAIL_BASE = SPR_SLOPES_BASE + 78,
@@ -94,7 +95,7 @@ enum Sprites {
SPR_LOCK = SPR_OPENTTD_BASE + 19, // lock icon (for password protected servers)
SPR_FLAGS_BASE = SPR_OPENTTD_BASE + 83, // start of the flags block (in same order as enum NetworkLanguage)
- SPR_AIRPORTX_BASE = SPR_OPENTTD_BASE + 109, // The sprites used for other airport angles
+ SPR_AIRPORTX_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITES_COUNT, // The sprites used for other airport angles
SPR_NEWAIRPORT_TARMAC = SPR_AIRPORTX_BASE,
SPR_NSRUNWAY1 = SPR_AIRPORTX_BASE + 1,
SPR_NSRUNWAY2 = SPR_AIRPORTX_BASE + 2,