Mercurial > hg > openttd

changeset 16474:17ecbae7d3b4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21198) -Fix: don't call variables properties in debug messages
author rubidium <rubidium@openttd.org>
date Mon, 15 Nov 2010 16:43:46 +0000
parents d065e2fd19da
children cc40724e03da
files src/newgrf_airporttiles.cpp src/newgrf_canal.cpp src/newgrf_cargo.cpp src/newgrf_engine.cpp src/newgrf_generic.cpp src/newgrf_house.cpp src/newgrf_industries.cpp src/newgrf_industrytiles.cpp src/newgrf_object.cpp src/newgrf_railtype.cpp src/newgrf_spritegroup.cpp src/newgrf_town.cpp
diffstat 12 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_airporttiles.cpp
+++ b/src/newgrf_airporttiles.cpp
@@ -208,7 +208,7 @@
 		case 0x62: return GetAirportTileIDAtOffset(GetNearbyTile(parameter, tile), st, object->grffile->grfid);
 	}
 
-	DEBUG(grf, 1, "Unhandled airport tile property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled airport tile variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_canal.cpp
+++ b/src/newgrf_canal.cpp
@@ -56,7 +56,7 @@
 		case 0x83: return GetWaterTileRandomBits(tile);
 	}
 
-	DEBUG(grf, 1, "Unhandled canal property 0x%02X", variable);
+	DEBUG(grf, 1, "Unhandled canal variable 0x%02X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -35,7 +35,7 @@
 
 static uint32 CargoGetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available)
 {
-	DEBUG(grf, 1, "Unhandled cargo property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled cargo variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -833,7 +833,7 @@
 		default: break;
 	}
 
-	DEBUG(grf, 1, "Unhandled vehicle property 0x%X, type 0x%X", variable, (uint)v->type);
+	DEBUG(grf, 1, "Unhandled vehicle variable 0x%X, type 0x%X", variable, (uint)v->type);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_generic.cpp
+++ b/src/newgrf_generic.cpp
@@ -100,7 +100,7 @@
 		default: break;
 	}
 
-	DEBUG(grf, 1, "Unhandled generic feature property 0x%02X", variable);
+	DEBUG(grf, 1, "Unhandled generic feature variable 0x%02X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_house.cpp
+++ b/src/newgrf_house.cpp
@@ -348,7 +348,7 @@
 		}
 	}
 
-	DEBUG(grf, 1, "Unhandled house property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled house variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_industries.cpp
+++ b/src/newgrf_industries.cpp
@@ -188,7 +188,7 @@
 	}
 
 	if (industry == NULL) {
-		DEBUG(grf, 1, "Unhandled property 0x%X (no available industry) in callback 0x%x", variable, object->callback);
+		DEBUG(grf, 1, "Unhandled variable 0x%X (no available industry) in callback 0x%x", variable, object->callback);
 
 		*available = false;
 		return UINT_MAX;
@@ -329,7 +329,7 @@
 		case 0xB4: return Clamp(industry->last_cargo_accepted_at - DAYS_TILL_ORIGINAL_BASE_YEAR, 0, 65535); // Date last cargo accepted since 1920 (in days)
 	}
 
-	DEBUG(grf, 1, "Unhandled industry property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled industry variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_industrytiles.cpp
+++ b/src/newgrf_industrytiles.cpp
@@ -102,7 +102,7 @@
 		case 0x62: return GetIndustryIDAtOffset(GetNearbyTile(parameter, tile), inds, object->grffile->grfid);
 	}
 
-	DEBUG(grf, 1, "Unhandled industry tile property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled industry tile variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_object.cpp
+++ b/src/newgrf_object.cpp
@@ -312,7 +312,7 @@
 	}
 
 unhandled:
-	DEBUG(grf, 1, "Unhandled object property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled object variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_railtype.cpp
+++ b/src/newgrf_railtype.cpp
@@ -54,7 +54,7 @@
 			return _date;
 	}
 
-	DEBUG(grf, 1, "Unhandled rail type tile property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled rail type tile variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;
--- a/src/newgrf_spritegroup.cpp
+++ b/src/newgrf_spritegroup.cpp
@@ -160,7 +160,7 @@
 		}
 
 		if (!available) {
-			/* Unsupported property: skip further processing and return either
+			/* Unsupported variable: skip further processing and return either
 			 * the group from the first range or the default group. */
 			return SpriteGroup::Resolve(this->num_ranges > 0 ? this->ranges[0].group : this->default_group, object);
 		}
--- a/src/newgrf_town.cpp
+++ b/src/newgrf_town.cpp
@@ -101,7 +101,7 @@
 		case 0xD5: return t->fund_buildings_months;
 	}
 
-	DEBUG(grf, 1, "Unhandled town property 0x%X", variable);
+	DEBUG(grf, 1, "Unhandled town variable 0x%X", variable);
 
 	*available = false;
 	return UINT_MAX;