cpp/openttd-patchpack/source Changeset - r15502:00ed169c2d14

Changeset - r15502:00ed169c2d14

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

michi_cc - 14 years ago 2010-07-16 19:02:59
michi_cc@openttd.org

(svn r20165) -Feature: [NewGRF] Information (var 4A) about the current railtype a train is on.

2 files changed with 8 insertions and 1 deletions:

src/newgrf_engine.cpp

src/newgrf_railtype.cpp

0 comments (0 inline, 0 general)

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -26,6 +26,7 @@ @@
 #include "station_base.h"
 #include "engine_base.h"
 #include "company_base.h"
 #include "newgrf_railtype.h"
 struct WagonOverride {
 	EngineID *train_id;
@@ @@ -644,6 +645,12 @@ static uint32 VehicleGetVariable(const R @@
 		case 0x48: return Engine::Get(v->engine_type)->flags; // Vehicle Type Info
 		case 0x49: return v->build_year;
 		case 0x4A: {
 			if (v->type != VEH_TRAIN) return 0;
 			RailType rt = GetTileRailType(v->tile);
 			return (HasPowerOnRail(Train::From(v)->railtype, rt) ? 0x100 : 0) | GetReverseRailTypeTranslation(rt, object->grffile);
+		}
 		/* Variables which use the parameter */
 		case 0x60: // Count consist's engine ID occurance
 			//EngineID engine = GetNewEngineID(GetEngineGRF(v->engine_type), v->type, parameter);

src/newgrf_railtype.cpp

➞

Show inline comments

@@ @@ -110,7 +110,7 @@ SpriteID GetCustomRailSprite(const Railt @@
 uint8 GetReverseRailTypeTranslation(RailType railtype, const GRFFile *grffile)
+{
 	/* No rail type table present, return rail type as-is */
 	if (grffile->railtype_max == 0) return railtype;
+	if (grffile == NULL || grffile->railtype_max == 0) return railtype;
 	/* Look for a matching rail type label in the table */
 	RailTypeLabel label = GetRailTypeInfo(railtype)->label;

0 comments (0 inline, 0 general)