summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2007-02-23 19:27:31 +0000
committerpeter1138 <peter1138@openttd.org>2007-02-23 19:27:31 +0000
commit20405f56b4597de7591b297eaa4d8275217029b4 (patch)
treea7543894fc29e662eba1c67fc4dc48fe62165dda /src
parent6dbf9f2f41e82a05d284c72ab3acbae949c3e904 (diff)
downloadopenttd-20405f56b4597de7591b297eaa4d8275217029b4.tar.xz
(svn r8863) -Fix: prefix engine_custom_sprites with _
Diffstat (limited to 'src')
-rw-r--r--src/newgrf_engine.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 1d21eb252..412c23585 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -109,7 +109,7 @@ void UnloadWagonOverrides(void)
// (It isn't and shouldn't be like this in the GRF files since new cargo types
// may appear in future - however it's more convenient to store it like this in
// memory. --pasky)
-static const SpriteGroup *engine_custom_sprites[TOTAL_NUM_ENGINES][NUM_GLOBAL_CID];
+static const SpriteGroup *_engine_custom_sprites[TOTAL_NUM_ENGINES][NUM_GLOBAL_CID];
static const GRFFile *_engine_grf[TOTAL_NUM_ENGINES];
void SetCustomEngineSprites(EngineID engine, byte cargo, const SpriteGroup *group)
@@ -117,10 +117,10 @@ void SetCustomEngineSprites(EngineID engine, byte cargo, const SpriteGroup *grou
assert(engine < TOTAL_NUM_ENGINES);
assert(cargo < NUM_GLOBAL_CID);
- if (engine_custom_sprites[engine][cargo] != NULL) {
+ if (_engine_custom_sprites[engine][cargo] != NULL) {
grfmsg(6, "SetCustomEngineSprites: engine %d cargo %d already has group -- replacing", engine, cargo);
}
- engine_custom_sprites[engine][cargo] = group;
+ _engine_custom_sprites[engine][cargo] = group;
}
/**
@@ -133,7 +133,7 @@ void UnloadCustomEngineSprites(void)
for (engine = 0; engine < TOTAL_NUM_ENGINES; engine++) {
for (cargo = 0; cargo < NUM_GLOBAL_CID; cargo++) {
- engine_custom_sprites[engine][cargo] = NULL;
+ _engine_custom_sprites[engine][cargo] = NULL;
}
_engine_grf[engine] = 0;
}
@@ -832,11 +832,11 @@ static const SpriteGroup *GetVehicleSpriteGroup(EngineID engine, const Vehicle *
}
}
- group = engine_custom_sprites[engine][cargo];
+ group = _engine_custom_sprites[engine][cargo];
if (group != NULL) return group;
/* Fall back to the default set if the selected cargo type is not defined */
- return engine_custom_sprites[engine][GC_DEFAULT];
+ return _engine_custom_sprites[engine][GC_DEFAULT];
}