From ec5b2c600b0a3c24f1dfb1192104e00e2dca384e Mon Sep 17 00:00:00 2001 From: peter1138 Date: Sat, 10 Mar 2007 09:23:33 +0000 Subject: [PATCH] (svn r9092) -Codechange: (NewGRF) (re r8885) Also set cargo type as invalid if the chosen type is not available in the current climate. --- src/newgrf.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index ea30c6eec0..4d04904c7d 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -365,7 +365,7 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf FOR_EACH_OBJECT { uint8 ctype = grf_load_byte(&buf); - if (ctype < NUM_CARGO) { + if (ctype < NUM_CARGO && HASBIT(_cargo_mask, ctype)) { rvi[i].cargo_type = ctype; } else { rvi[i].cargo_type = CT_INVALID; @@ -557,7 +557,7 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf FOR_EACH_OBJECT { uint8 cargo = grf_load_byte(&buf); - if (cargo < NUM_CARGO) { + if (cargo < NUM_CARGO && HASBIT(_cargo_mask, cargo)) { rvi[i].cargo_type = cargo; } else { rvi[i].cargo_type = CT_INVALID; @@ -671,7 +671,7 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf FOR_EACH_OBJECT { uint8 cargo = grf_load_byte(&buf); - if (cargo < NUM_CARGO) { + if (cargo < NUM_CARGO && HASBIT(_cargo_mask, cargo)) { svi[i].cargo_type = cargo; } else { svi[i].cargo_type = CT_INVALID;