summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarkvater <darkvater@openttd.org>2006-03-26 22:56:58 +0000
committerDarkvater <darkvater@openttd.org>2006-03-26 22:56:58 +0000
commitd7b34a1d4cf20b690819c3c7d14adea88b436612 (patch)
treef7099774299fad7c2e43f0b236e7c94c7b4fe170
parent2c27f45cdc31c0466d72eb8d1539448b93af0d5b (diff)
downloadopenttd-d7b34a1d4cf20b690819c3c7d14adea88b436612.tar.xz
(svn r4132) - Missed 3 CargoID's
-rw-r--r--ai/default/default.c2
-rw-r--r--newgrf_engine.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/ai/default/default.c b/ai/default/default.c
index cb17433e6..2a638e3e9 100644
--- a/ai/default/default.c
+++ b/ai/default/default.c
@@ -2327,7 +2327,7 @@ static void AiStateBuildRailVeh(Player *p)
TileIndex tile;
EngineID veh;
int i;
- int cargo;
+ CargoID cargo;
int32 cost;
Vehicle *v;
uint loco_id;
diff --git a/newgrf_engine.c b/newgrf_engine.c
index 5fd6c0189..7f534deed 100644
--- a/newgrf_engine.c
+++ b/newgrf_engine.c
@@ -397,7 +397,7 @@ int GetCustomEngineSprite(EngineID engine, const Vehicle* v, Direction direction
{
const SpriteGroup *group;
const RealSpriteGroup *rsg;
- byte cargo = GC_PURCHASE;
+ CargoID cargo = GC_PURCHASE;
byte loaded = 0;
bool in_motion = 0;
int totalsets, spriteset;
@@ -487,7 +487,7 @@ bool UsesWagonOverride(const Vehicle* v)
uint16 GetCallBackResult(uint16 callback_info, EngineID engine, const Vehicle *v)
{
const SpriteGroup *group;
- byte cargo = GC_DEFAULT;
+ CargoID cargo = GC_DEFAULT;
if (v != NULL)
cargo = _global_cargo_id[_opt.landscape][v->cargo_type];