Mercurial > hg > openttd

diff src/newgrf_engine.cpp @ 11386:5c3e9447c441 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15739) -Codechange: Expose GRF ID of engines in var action property 0x25.
author peter1138 <peter1138@openttd.org>
date Mon, 16 Mar 2009 08:03:50 +0000 (2009-03-16)
parents 82c90cd591ab
children 86fca539ec7a
line wrap: on
line diff
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -122,7 +122,8 @@
  */
 uint32 GetEngineGRFID(EngineID engine)
 {
-	return GetEngineGRF(engine)->grfid;
+	const GRFFile *file = GetEngineGRF(engine);
+	return file == NULL ? 0 : file->grfid;
 }
 
 
@@ -500,6 +501,9 @@
 
 	/* Calculated vehicle parameters */
 	switch (variable) {
+		case 0x25: // Get engine GRF ID
+			return GetEngineGRFID(v->engine_type);
+
 		case 0x40: // Get length of consist
 			if (!HasBit(v->cache_valid, 0)) {
 				v->cached_var40 = PositionHelper(v, false);