summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Nelson <peter1138@openttd.org>2019-03-18 01:47:11 +0000
committerPeterN <peter@fuzzle.org>2019-03-21 20:53:36 +0000
commit054d05b1328e2c733d3910c9d55de724b61995dc (patch)
tree963cb13ea309fbace9e880e7342bb6dd82a5d0ff
parent2cf7ac2863028181bfdb5e3d63dc1f37bf604e72 (diff)
downloadopenttd-054d05b1328e2c733d3910c9d55de724b61995dc.tar.xz
Codechange: NewGRF features are documented in hex, so display as hex.
-rw-r--r--src/newgrf.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 13d1377d0..75cc4b635 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2103,7 +2103,7 @@ static ChangeInfoResult CanalChangeInfo(uint id, int numinfo, int prop, ByteRead
ChangeInfoResult ret = CIR_SUCCESS;
if (id + numinfo > CF_END) {
- grfmsg(1, "CanalChangeInfo: Canal feature %u is invalid, max %u, ignoring", id + numinfo, CF_END);
+ grfmsg(1, "CanalChangeInfo: Canal feature 0x%02X is invalid, max %u, ignoring", id + numinfo, CF_END);
return CIR_INVALID_ID;
}
@@ -4530,11 +4530,11 @@ static void FeatureChangeInfo(ByteReader *buf)
uint numinfo = buf->ReadByte();
uint engine = buf->ReadExtendedByte();
- grfmsg(6, "FeatureChangeInfo: feature %d, %d properties, to apply to %d+%d",
+ grfmsg(6, "FeatureChangeInfo: Feature 0x%02X, %d properties, to apply to %d+%d",
feature, numprops, engine, numinfo);
if (feature >= lengthof(handler) || handler[feature] == NULL) {
- if (feature != GSF_CARGOES) grfmsg(1, "FeatureChangeInfo: Unsupported feature %d, skipping", feature);
+ if (feature != GSF_CARGOES) grfmsg(1, "FeatureChangeInfo: Unsupported feature 0x%02X, skipping", feature);
return;
}
@@ -4651,7 +4651,7 @@ static void NewSpriteSet(ByteReader *buf)
_cur.AddSpriteSets(feature, _cur.spriteid, first_set, num_sets, num_ents);
- grfmsg(7, "New sprite set at %d of type %d, consisting of %d sets with %d views each (total %d)",
+ grfmsg(7, "New sprite set at %d of feature 0x%02X, consisting of %d sets with %d views each (total %d)",
_cur.spriteid, feature, num_sets, num_ents, num_sets * num_ents
);
@@ -5046,7 +5046,7 @@ static void NewSpriteGroup(ByteReader *buf)
}
/* Loading of Tile Layout and Production Callback groups would happen here */
- default: grfmsg(1, "NewSpriteGroup: Unsupported feature %d, skipping", feature);
+ default: grfmsg(1, "NewSpriteGroup: Unsupported feature 0x%02X, skipping", feature);
}
}
}
@@ -5580,7 +5580,7 @@ static void FeatureMapSpriteGroup(ByteReader *buf)
uint16 groupid = buf->ReadWord();
if (!IsValidGroupID(groupid, "FeatureMapSpriteGroup")) return;
- grfmsg(6, "FeatureMapSpriteGroup: Adding generic feature callback for feature %d", feature);
+ grfmsg(6, "FeatureMapSpriteGroup: Adding generic feature callback for feature 0x%02X", feature);
AddGenericCallback(feature, _cur.grffile, _cur.spritegroups[groupid]);
return;
@@ -5589,7 +5589,7 @@ static void FeatureMapSpriteGroup(ByteReader *buf)
/* Mark the feature as used by the grf (generic callbacks do not count) */
SetBit(_cur.grffile->grf_features, feature);
- grfmsg(6, "FeatureMapSpriteGroup: Feature %d, %d ids", feature, idcount);
+ grfmsg(6, "FeatureMapSpriteGroup: Feature 0x%02X, %d ids", feature, idcount);
switch (feature) {
case GSF_TRAINS:
@@ -5640,7 +5640,7 @@ static void FeatureMapSpriteGroup(ByteReader *buf)
return;
default:
- grfmsg(1, "FeatureMapSpriteGroup: Unsupported feature %d, skipping", feature);
+ grfmsg(1, "FeatureMapSpriteGroup: Unsupported feature 0x%02X, skipping", feature);
return;
}
}
@@ -5683,7 +5683,7 @@ static void FeatureNewName(ByteReader *buf)
uint16 endid = id + num;
- grfmsg(6, "FeatureNewName: About to rename engines %d..%d (feature %d) in language 0x%02X",
+ grfmsg(6, "FeatureNewName: About to rename engines %d..%d (feature 0x%02X) in language 0x%02X",
id, endid, feature, lang);
for (; id < endid && buf->HasData(); id++) {