From a6a2fbd937e0a424306919959530252444699849 Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 15 Nov 2010 16:43:46 +0000 Subject: [PATCH] (svn r21198) -Fix: don't call variables properties in debug messages --- src/newgrf_airporttiles.cpp | 2 +- src/newgrf_canal.cpp | 2 +- src/newgrf_cargo.cpp | 2 +- src/newgrf_engine.cpp | 2 +- src/newgrf_generic.cpp | 2 +- src/newgrf_house.cpp | 2 +- src/newgrf_industries.cpp | 4 ++-- src/newgrf_industrytiles.cpp | 2 +- src/newgrf_object.cpp | 2 +- src/newgrf_railtype.cpp | 2 +- src/newgrf_spritegroup.cpp | 2 +- src/newgrf_town.cpp | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/newgrf_airporttiles.cpp b/src/newgrf_airporttiles.cpp index 7b6d1745ee..5a1ba24c1e 100644 --- a/src/newgrf_airporttiles.cpp +++ b/src/newgrf_airporttiles.cpp @@ -208,7 +208,7 @@ static uint32 AirportTileGetVariable(const ResolverObject *object, byte variable 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; diff --git a/src/newgrf_canal.cpp b/src/newgrf_canal.cpp index 91888ea359..2b17fcb5e7 100644 --- a/src/newgrf_canal.cpp +++ b/src/newgrf_canal.cpp @@ -56,7 +56,7 @@ static uint32 CanalGetVariable(const ResolverObject *object, byte variable, byte 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; diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp index d0f97c6cdd..257e96ee6f 100644 --- a/src/newgrf_cargo.cpp +++ b/src/newgrf_cargo.cpp @@ -35,7 +35,7 @@ static void CargoSetTriggers(const ResolverObject *object, int triggers) 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; diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 5d5979cd91..677c7becca 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -833,7 +833,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by 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; diff --git a/src/newgrf_generic.cpp b/src/newgrf_generic.cpp index 7c4c6097e8..7d83d73b1b 100644 --- a/src/newgrf_generic.cpp +++ b/src/newgrf_generic.cpp @@ -100,7 +100,7 @@ static uint32 GenericCallbackGetVariable(const ResolverObject *object, byte vari 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; diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index 137f0adf25..ef9aa2d0e4 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -348,7 +348,7 @@ static uint32 HouseGetVariable(const ResolverObject *object, byte variable, byte } } - DEBUG(grf, 1, "Unhandled house property 0x%X", variable); + DEBUG(grf, 1, "Unhandled house variable 0x%X", variable); *available = false; return UINT_MAX; diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index 4df5949b12..ef96572cc9 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -188,7 +188,7 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par } 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 @@ uint32 IndustryGetVariable(const ResolverObject *object, byte variable, byte par 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; diff --git a/src/newgrf_industrytiles.cpp b/src/newgrf_industrytiles.cpp index 30ca35c769..17a089c599 100644 --- a/src/newgrf_industrytiles.cpp +++ b/src/newgrf_industrytiles.cpp @@ -102,7 +102,7 @@ static uint32 IndustryTileGetVariable(const ResolverObject *object, byte variabl 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; diff --git a/src/newgrf_object.cpp b/src/newgrf_object.cpp index 63feda8d67..e04c0dee69 100644 --- a/src/newgrf_object.cpp +++ b/src/newgrf_object.cpp @@ -312,7 +312,7 @@ static uint32 ObjectGetVariable(const ResolverObject *object, byte variable, byt } unhandled: - DEBUG(grf, 1, "Unhandled object property 0x%X", variable); + DEBUG(grf, 1, "Unhandled object variable 0x%X", variable); *available = false; return UINT_MAX; diff --git a/src/newgrf_railtype.cpp b/src/newgrf_railtype.cpp index c11c011171..6f38794b6b 100644 --- a/src/newgrf_railtype.cpp +++ b/src/newgrf_railtype.cpp @@ -54,7 +54,7 @@ static uint32 RailTypeGetVariable(const ResolverObject *object, byte variable, b 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; diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index 116c58ff4d..23521c3606 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -160,7 +160,7 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject *object) con } 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); } diff --git a/src/newgrf_town.cpp b/src/newgrf_town.cpp index 43b61b08a7..2dfc05b2a3 100644 --- a/src/newgrf_town.cpp +++ b/src/newgrf_town.cpp @@ -101,7 +101,7 @@ uint32 TownGetVariable(byte variable, byte parameter, bool *available, const Tow 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;