Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r24692) -Cleanup: Cleanup final parts of the old resolver code.

Browse Source
pull/155/head
alberth 12 years ago
parent 7b18c31f37
commit 8a297ca5f1
23 changed files with 96 additions and 229 deletions
Show Stats Download Patch File Download Diff File

2
src/newgrf_airport.cpp
Unescape Escape View File

@ -41,7 +41,7 @@ struct AirportResolverObject : public ResolverObject {
{
switch (scope) {
case VSG_SCOPE_SELF: return &this->airport_scope;
default: return &this->default_scope; // XXX return ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}

7
src/newgrf_airporttiles.cpp
Unescape Escape View File

@ -98,13 +98,6 @@ StationGfx GetTranslatedAirportTileID(StationGfx gfx)
return it->grf_prop.override == INVALID_AIRPORTTILE ? gfx : it->grf_prop.override;
}
/* virtual */ const SpriteGroup *AirportTileResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
/* AirportTile do not have 'real' groups. */
return NULL;
}
/**
* Based on newhouses/newindustries equivalent, but adapted for airports.
* @param parameter from callback. It's in fact a pair of coordinates

4
src/newgrf_airporttiles.h
Unescape Escape View File

@ -39,11 +39,9 @@ struct AirportTileResolverObject : public ResolverObject {
{
switch (scope) {
case VSG_SCOPE_SELF: return &tiles_scope;
default: return &this->default_scope; // XXX return ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}
/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
};
/**

2
src/newgrf_canal.cpp
Unescape Escape View File

@ -38,7 +38,7 @@ struct CanalResolverObject : public ResolverObject {
{
switch (scope) {
case VSG_SCOPE_SELF: return &this->canal_scope;
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}

5
src/newgrf_cargo.cpp
Unescape Escape View File

@ -16,11 +16,6 @@
struct CargoResolverObject : public ResolverObject {
CargoResolverObject(const CargoSpec *cs, CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
/* virtual */ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0)
{
return &this->default_scope; //XXX ResolverObject::GetScope(scope, relative);
}
/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
};

16
src/newgrf_debug_gui.cpp
Unescape Escape View File

@ -160,13 +160,7 @@ public:
* @param avail Return whether the variable is available.
* @return The resolved variable's value.
*/
virtual uint Resolve(uint index, uint var, uint param, bool *avail) const
{
ResolverObject ro;
memset(&ro, 0, sizeof(ro));
this->Resolve(&ro, index);
return ro.GetScope(ro.scope)->GetVariable(var, param, avail);
}
virtual uint Resolve(uint index, uint var, uint param, bool *avail) const = 0;
/**
* Used to decide if the PSA needs a parameter or not.
@ -200,14 +194,6 @@ public:
}
protected:
/**
* Actually execute the real resolving for a given (instance) index.
* @param ro The resolver object to fill with everything
* needed to be able to resolve a variable.
* @param index The (instance) index of the to-be-resolved variable.
*/
virtual void Resolve(ResolverObject *ro, uint index) const {}
/**
* Helper to make setting the strings easier.
* @param string the string to actually draw.

2
src/newgrf_engine.cpp
Unescape Escape View File

@ -408,7 +408,7 @@ static byte MapAircraftMovementAction(const Aircraft *v)
}
return &this->relative_scope;
}
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}

2
src/newgrf_generic.cpp
Unescape Escape View File

@ -48,7 +48,7 @@ struct GenericResolverObject : public ResolverObject {
{
switch (scope) {
case VSG_SCOPE_SELF: return &this->generic_scope;
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}

6
src/newgrf_house.cpp
Unescape Escape View File

@ -411,12 +411,6 @@ static uint32 GetDistanceFromNearbyHouse(uint8 parameter, TileIndex tile, HouseI
return UINT_MAX;
}
/* virtual */ const SpriteGroup *HouseResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
/* Houses do not have 'real' groups */
return NULL;
}
uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, Town *town, TileIndex tile,
bool not_yet_constructed, uint8 initial_random_bits, uint32 watched_cargo_triggers)
{

4
src/newgrf_house.h
Unescape Escape View File

@ -49,11 +49,9 @@ struct HouseResolverObject : public ResolverObject {
switch (scope) {
case VSG_SCOPE_SELF: return &this->house_scope;
case VSG_SCOPE_PARENT: return &this->town_scope;
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}
/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
};
/**

6
src/newgrf_industries.cpp
Unescape Escape View File

@ -359,12 +359,6 @@ static uint32 GetCountAndDistanceOfClosestInstance(byte param_setID, byte layout
return UINT_MAX;
}
/* virtual */ const SpriteGroup *IndustriesResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
/* IndustryTile do not have 'real' groups */
return NULL;
}
/* virtual */ uint32 IndustriesScopeResolver::GetRandomBits() const
{
return this->industry != NULL ? this->industry->random : 0;

4
src/newgrf_industries.h
Unescape Escape View File

@ -48,11 +48,9 @@ struct IndustriesResolverObject : public ResolverObject {
if (tsr != NULL) return tsr;
/* FALL-THROUGH */
}
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}
/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
};
/** When should the industry(tile) be triggered for random bits? */

6
src/newgrf_industrytiles.cpp
Unescape Escape View File

@ -99,12 +99,6 @@ uint32 GetRelativePosition(TileIndex tile, TileIndex ind_tile)
return UINT_MAX;
}
/* virtual */ const SpriteGroup *IndustryTileResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
/* IndustryTile do not have 'real' groups. Or do they?? */
return NULL;
}
/* virtual */ uint32 IndustryTileScopeResolver::GetRandomBits() const
{
assert(this->industry != NULL && IsValidTile(this->tile));

4
src/newgrf_industrytiles.h
Unescape Escape View File

@ -40,11 +40,9 @@ struct IndustryTileResolverObject : public ResolverObject {
switch (scope) {
case VSG_SCOPE_SELF: return &indtile_scope;
case VSG_SCOPE_PARENT: return &ind_scope;
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}
/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
};
bool DrawNewIndustryTile(TileInfo *ti, Industry *i, IndustryGfx gfx, const IndustryTileSpec *inds);

6
src/newgrf_object.cpp
Unescape Escape View File

@ -337,12 +337,6 @@ unhandled:
return UINT_MAX;
}
/* virtual */ const SpriteGroup *ObjectResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
/* Objects do not have 'real' groups */
return NULL;
}
/**
* Get the object's sprite group.
* @param spec The specification to get the sprite group from.

4
src/newgrf_object.h
Unescape Escape View File

@ -124,12 +124,10 @@ struct ObjectResolverObject : public ResolverObject {
/* FALL-THROUGH */
}
default: return &this->default_scope; // XXX return &ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}
const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
private:
TownScopeResolver *GetTown();
};

2
src/newgrf_railtype.h
Unescape Escape View File

@ -37,7 +37,7 @@ struct RailTypeResolverObject : public ResolverObject {
{
switch (scope) {
case VSG_SCOPE_SELF: return &this->railtype_scope;
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}

35
src/newgrf_spritegroup.cpp
Unescape Escape View File

@ -116,37 +116,8 @@ ScopeResolver::~ScopeResolver() {}
/* virtual */ void ScopeResolver::StorePSA(uint reg, int32 value) {}
TempScopeResolver::TempScopeResolver(ResolverObject *ro) : ScopeResolver(ro) {}
/* virtual */ uint32 TempScopeResolver::GetRandomBits() const
{
return this->ro->GetRandomBits(this->ro);
}
/* virtual */ uint32 TempScopeResolver::GetTriggers() const
{
return this->ro->GetTriggers(this->ro);
}
/* virtual */ void TempScopeResolver::SetTriggers(int triggers) const
{
this->ro->SetTriggers(this->ro, triggers);
}
/* virtual */ uint32 TempScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const
{
return this->ro->GetVariable(this->ro, variable, parameter, available);
}
/* virtual */ void TempScopeResolver::StorePSA(uint reg, int32 value)
{
if (this->ro->StorePSA != NULL) this->ro->StorePSA(this->ro, reg, value);
}
ResolverObject::ResolverObject() : default_scope(this), temp_scope(this) {} // XXX Temporary
ResolverObject::ResolverObject(const GRFFile *grffile, CallbackID callback, uint32 callback_param1, uint32 callback_param2)
: default_scope(this), temp_scope(this)
: default_scope(this)
{
this->callback = callback;
this->callback_param1 = callback_param1;
@ -160,7 +131,7 @@ ResolverObject::~ResolverObject() {}
/* virtual */ const SpriteGroup *ResolverObject::ResolveReal(const RealSpriteGroup *group) const
{
return this->ResolveRealMethod(this, group);
return NULL;
}
/**
@ -171,7 +142,7 @@ ResolverObject::~ResolverObject() {}
*/
/* virtual */ ScopeResolver *ResolverObject::GetScope(VarSpriteGroupScope scope, byte relative)
{
return &this->temp_scope;
return &this->default_scope;
}
/**

20
src/newgrf_spritegroup.h
Unescape Escape View File

@ -317,24 +317,11 @@ struct ScopeResolver {
virtual void StorePSA(uint reg, int32 value);
};
struct TempScopeResolver : public ScopeResolver {
TempScopeResolver(ResolverObject *ro);
virtual uint32 GetRandomBits() const;
virtual uint32 GetTriggers() const;
virtual void SetTriggers(int triggers) const;
virtual uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;
virtual void StorePSA(uint reg, int32 value);
};
struct ResolverObject {
ResolverObject();
ResolverObject(const GRFFile *grffile, CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
virtual ~ResolverObject();
ScopeResolver default_scope; ///< Default implementation of the grf scope.
TempScopeResolver temp_scope; ///< Temporary scope resolver to refer back to the methods of #ResolverObject.
CallbackID callback;
uint32 callback_param1;
@ -350,13 +337,6 @@ struct ResolverObject {
const GRFFile *grffile; ///< GRFFile the resolved SpriteGroup belongs to
uint32 (*GetRandomBits)(const struct ResolverObject*);
uint32 (*GetTriggers)(const struct ResolverObject*);
void (*SetTriggers)(const struct ResolverObject*, int);
uint32 (*GetVariable)(const struct ResolverObject *object, byte variable, uint32 parameter, bool *available);
const SpriteGroup *(*ResolveRealMethod)(const struct ResolverObject*, const RealSpriteGroup*);
void (*StorePSA)(struct ResolverObject*, uint, int32);
virtual const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
virtual ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0);

2
src/newgrf_station.h
Unescape Escape View File

@ -61,7 +61,7 @@ struct StationResolverObject : public ResolverObject {
}
default:
return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
return ResolverObject::GetScope(scope, relative);
}
}

172
src/newgrf_town.cpp
Unescape Escape View File

@ -21,42 +21,28 @@ TownScopeResolver::TownScopeResolver(ResolverObject *ro, Town *t, bool readonly)
}
/* virtual */ uint32 TownScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const
{
return TownGetVariable(variable, parameter, available, this->t, this->ro->grffile);
}
/**
* This function implements the town variables that newGRF defines.
* @param variable that is queried
* @param parameter unused
* @param available will return false if ever the variable asked for does not exist
* @param t is of course the town we are inquiring
* @param caller_grffile #GRFFile of the entity asking for a town variable.
* @return the value stored in the corresponding variable
*/
uint32 TownGetVariable(byte variable, uint32 parameter, bool *available, Town *t, const GRFFile *caller_grffile)
{
switch (variable) {
/* Larger towns */
case 0x40:
if (_settings_game.economy.larger_towns == 0) return 2;
if (t->larger_town) return 1;
if (this->t->larger_town) return 1;
return 0;
/* Town index */
case 0x41: return t->index;
case 0x41: return this->t->index;
/* Get a variable from the persistent storage */
case 0x7C: {
/* Check the persistent storage for the GrfID stored in register 100h. */
uint32 grfid = GetRegister(0x100);
if (grfid == 0xFFFFFFFF) {
if (caller_grffile == NULL) return 0;
grfid = caller_grffile->grfid;
if (this->ro->grffile == NULL) return 0;
grfid = this->ro->grffile->grfid;
}
std::list<PersistentStorage *>::iterator iter;
for (iter = t->psa_list.begin(); iter != t->psa_list.end(); iter++) {
for (iter = this->t->psa_list.begin(); iter != this->t->psa_list.end(); iter++) {
if ((*iter)->grfid == grfid) return (*iter)->GetValue(parameter);
}
@ -64,71 +50,71 @@ uint32 TownGetVariable(byte variable, uint32 parameter, bool *available, Town *t
}
/* Town properties */
case 0x80: return t->xy;
case 0x81: return GB(t->xy, 8, 8);
case 0x82: return ClampToU16(t->cache.population);
case 0x83: return GB(ClampToU16(t->cache.population), 8, 8);
case 0x8A: return t->grow_counter;
case 0x92: return t->flags; // In original game, 0x92 and 0x93 are really one word. Since flags is a byte, this is to adjust
case 0x80: return this->t->xy;
case 0x81: return GB(this->t->xy, 8, 8);
case 0x82: return ClampToU16(this->t->cache.population);
case 0x83: return GB(ClampToU16(this->t->cache.population), 8, 8);
case 0x8A: return this->t->grow_counter;
case 0x92: return this->t->flags; // In original game, 0x92 and 0x93 are really one word. Since flags is a byte, this is to adjust
case 0x93: return 0;
case 0x94: return ClampToU16(t->cache.squared_town_zone_radius[0]);
case 0x95: return GB(ClampToU16(t->cache.squared_town_zone_radius[0]), 8, 8);
case 0x96: return ClampToU16(t->cache.squared_town_zone_radius[1]);
case 0x97: return GB(ClampToU16(t->cache.squared_town_zone_radius[1]), 8, 8);
case 0x98: return ClampToU16(t->cache.squared_town_zone_radius[2]);
case 0x99: return GB(ClampToU16(t->cache.squared_town_zone_radius[2]), 8, 8);
case 0x9A: return ClampToU16(t->cache.squared_town_zone_radius[3]);
case 0x9B: return GB(ClampToU16(t->cache.squared_town_zone_radius[3]), 8, 8);
case 0x9C: return ClampToU16(t->cache.squared_town_zone_radius[4]);
case 0x9D: return GB(ClampToU16(t->cache.squared_town_zone_radius[4]), 8, 8);
case 0x9E: return t->ratings[0];
case 0x9F: return GB(t->ratings[0], 8, 8);
case 0xA0: return t->ratings[1];
case 0xA1: return GB(t->ratings[1], 8, 8);
case 0xA2: return t->ratings[2];
case 0xA3: return GB(t->ratings[2], 8, 8);
case 0xA4: return t->ratings[3];
case 0xA5: return GB(t->ratings[3], 8, 8);
case 0xA6: return t->ratings[4];
case 0xA7: return GB(t->ratings[4], 8, 8);
case 0xA8: return t->ratings[5];
case 0xA9: return GB(t->ratings[5], 8, 8);
case 0xAA: return t->ratings[6];
case 0xAB: return GB(t->ratings[6], 8, 8);
case 0xAC: return t->ratings[7];
case 0xAD: return GB(t->ratings[7], 8, 8);
case 0xAE: return t->have_ratings;
case 0xB2: return t->statues;
case 0xB6: return ClampToU16(t->cache.num_houses);
case 0xB9: return t->growth_rate & (~TOWN_GROW_RATE_CUSTOM);
case 0xBA: return ClampToU16(t->supplied[CT_PASSENGERS].new_max);
case 0xBB: return GB(ClampToU16(t->supplied[CT_PASSENGERS].new_max), 8, 8);
case 0xBC: return ClampToU16(t->supplied[CT_MAIL].new_max);
case 0xBD: return GB(ClampToU16(t->supplied[CT_MAIL].new_max), 8, 8);
case 0xBE: return ClampToU16(t->supplied[CT_PASSENGERS].new_act);
case 0xBF: return GB(ClampToU16(t->supplied[CT_PASSENGERS].new_act), 8, 8);
case 0xC0: return ClampToU16(t->supplied[CT_MAIL].new_act);
case 0xC1: return GB(ClampToU16(t->supplied[CT_MAIL].new_act), 8, 8);
case 0xC2: return ClampToU16(t->supplied[CT_PASSENGERS].old_max);
case 0xC3: return GB(ClampToU16(t->supplied[CT_PASSENGERS].old_max), 8, 8);
case 0xC4: return ClampToU16(t->supplied[CT_MAIL].old_max);
case 0xC5: return GB(ClampToU16(t->supplied[CT_MAIL].old_max), 8, 8);
case 0xC6: return ClampToU16(t->supplied[CT_PASSENGERS].old_act);
case 0xC7: return GB(ClampToU16(t->supplied[CT_PASSENGERS].old_act), 8, 8);
case 0xC8: return ClampToU16(t->supplied[CT_MAIL].old_act);
case 0xC9: return GB(ClampToU16(t->supplied[CT_MAIL].old_act), 8, 8);
case 0xCA: return t->GetPercentTransported(CT_PASSENGERS);
case 0xCB: return t->GetPercentTransported(CT_MAIL);
case 0xCC: return t->received[TE_FOOD].new_act;
case 0xCD: return GB(t->received[TE_FOOD].new_act, 8, 8);
case 0xCE: return t->received[TE_WATER].new_act;
case 0xCF: return GB(t->received[TE_WATER].new_act, 8, 8);
case 0xD0: return t->received[TE_FOOD].old_act;
case 0xD1: return GB(t->received[TE_FOOD].old_act, 8, 8);
case 0xD2: return t->received[TE_WATER].old_act;
case 0xD3: return GB(t->received[TE_WATER].old_act, 8, 8);
case 0xD4: return t->road_build_months;
case 0xD5: return t->fund_buildings_months;
case 0x94: return ClampToU16(this->t->cache.squared_town_zone_radius[0]);
case 0x95: return GB(ClampToU16(this->t->cache.squared_town_zone_radius[0]), 8, 8);
case 0x96: return ClampToU16(this->t->cache.squared_town_zone_radius[1]);
case 0x97: return GB(ClampToU16(this->t->cache.squared_town_zone_radius[1]), 8, 8);
case 0x98: return ClampToU16(this->t->cache.squared_town_zone_radius[2]);
case 0x99: return GB(ClampToU16(this->t->cache.squared_town_zone_radius[2]), 8, 8);
case 0x9A: return ClampToU16(this->t->cache.squared_town_zone_radius[3]);
case 0x9B: return GB(ClampToU16(this->t->cache.squared_town_zone_radius[3]), 8, 8);
case 0x9C: return ClampToU16(this->t->cache.squared_town_zone_radius[4]);
case 0x9D: return GB(ClampToU16(this->t->cache.squared_town_zone_radius[4]), 8, 8);
case 0x9E: return this->t->ratings[0];
case 0x9F: return GB(this->t->ratings[0], 8, 8);
case 0xA0: return this->t->ratings[1];
case 0xA1: return GB(this->t->ratings[1], 8, 8);
case 0xA2: return this->t->ratings[2];
case 0xA3: return GB(this->t->ratings[2], 8, 8);
case 0xA4: return this->t->ratings[3];
case 0xA5: return GB(this->t->ratings[3], 8, 8);
case 0xA6: return this->t->ratings[4];
case 0xA7: return GB(this->t->ratings[4], 8, 8);
case 0xA8: return this->t->ratings[5];
case 0xA9: return GB(this->t->ratings[5], 8, 8);
case 0xAA: return this->t->ratings[6];
case 0xAB: return GB(this->t->ratings[6], 8, 8);
case 0xAC: return this->t->ratings[7];
case 0xAD: return GB(this->t->ratings[7], 8, 8);
case 0xAE: return this->t->have_ratings;
case 0xB2: return this->t->statues;
case 0xB6: return ClampToU16(this->t->cache.num_houses);
case 0xB9: return this->t->growth_rate & (~TOWN_GROW_RATE_CUSTOM);
case 0xBA: return ClampToU16(this->t->supplied[CT_PASSENGERS].new_max);
case 0xBB: return GB(ClampToU16(this->t->supplied[CT_PASSENGERS].new_max), 8, 8);
case 0xBC: return ClampToU16(this->t->supplied[CT_MAIL].new_max);
case 0xBD: return GB(ClampToU16(this->t->supplied[CT_MAIL].new_max), 8, 8);
case 0xBE: return ClampToU16(this->t->supplied[CT_PASSENGERS].new_act);
case 0xBF: return GB(ClampToU16(this->t->supplied[CT_PASSENGERS].new_act), 8, 8);
case 0xC0: return ClampToU16(this->t->supplied[CT_MAIL].new_act);
case 0xC1: return GB(ClampToU16(this->t->supplied[CT_MAIL].new_act), 8, 8);
case 0xC2: return ClampToU16(this->t->supplied[CT_PASSENGERS].old_max);
case 0xC3: return GB(ClampToU16(this->t->supplied[CT_PASSENGERS].old_max), 8, 8);
case 0xC4: return ClampToU16(this->t->supplied[CT_MAIL].old_max);
case 0xC5: return GB(ClampToU16(this->t->supplied[CT_MAIL].old_max), 8, 8);
case 0xC6: return ClampToU16(this->t->supplied[CT_PASSENGERS].old_act);
case 0xC7: return GB(ClampToU16(this->t->supplied[CT_PASSENGERS].old_act), 8, 8);
case 0xC8: return ClampToU16(this->t->supplied[CT_MAIL].old_act);
case 0xC9: return GB(ClampToU16(this->t->supplied[CT_MAIL].old_act), 8, 8);
case 0xCA: return this->t->GetPercentTransported(CT_PASSENGERS);
case 0xCB: return this->t->GetPercentTransported(CT_MAIL);
case 0xCC: return this->t->received[TE_FOOD].new_act;
case 0xCD: return GB(this->t->received[TE_FOOD].new_act, 8, 8);
case 0xCE: return this->t->received[TE_WATER].new_act;
case 0xCF: return GB(this->t->received[TE_WATER].new_act, 8, 8);
case 0xD0: return this->t->received[TE_FOOD].old_act;
case 0xD1: return GB(this->t->received[TE_FOOD].old_act, 8, 8);
case 0xD2: return this->t->received[TE_WATER].old_act;
case 0xD3: return GB(this->t->received[TE_WATER].old_act, 8, 8);
case 0xD4: return this->t->road_build_months;
case 0xD5: return this->t->fund_buildings_months;
}
DEBUG(grf, 1, "Unhandled town variable 0x%X", variable);
@ -140,29 +126,17 @@ uint32 TownGetVariable(byte variable, uint32 parameter, bool *available, Town *t
/* virtual */ void TownScopeResolver::StorePSA(uint pos, int32 value)
{
if (this->readonly) return;
TownStorePSA(this->t, this->ro->grffile, pos, value);
}
/**
* Store a value in town persistent storage.
* @param t Town owning the persistent storage.
* @param caller_grffile #GRFFile of the entity that wants to use the storage.
* @param pos Position to write at.
* @param value Value to write.
* @return the value stored in the corresponding variable
*/
void TownStorePSA(Town *t, const GRFFile *caller_grffile, uint pos, int32 value)
{
assert(t != NULL);
assert(this->t != NULL);
/* We can't store anything if the caller has no #GRFFile. */
if (caller_grffile == NULL) return;
if (this->ro->grffile == NULL) return;
/* Check the persistent storage for the GrfID stored in register 100h. */
uint32 grfid = GetRegister(0x100);
/* A NewGRF can only write in the persistent storage associated to its own GRFID. */
if (grfid == 0xFFFFFFFF) grfid = caller_grffile->grfid;
if (grfid != caller_grffile->grfid) return;
if (grfid == 0xFFFFFFFF) grfid = this->ro->grffile->grfid;
if (grfid != this->ro->grffile->grfid) return;
/* Check if the storage exists. */
std::list<PersistentStorage *>::iterator iter;

7
src/newgrf_town.h
Unescape Escape View File

@ -18,10 +18,7 @@
/* Currently there is no direct town resolver; we only need to get town
* variable results from inside stations, house tiles and industries,
* and to check the town's persistent storage.
* XXX Remove the functions. */
uint32 TownGetVariable(byte variable, uint32 parameter, bool *available, Town *t, const struct GRFFile *caller_grffile);
void TownStorePSA(Town *t, const struct GRFFile *caller_grffile, uint pos, int32 value);
*/
struct TownScopeResolver : public ScopeResolver {
Town *t;
bool readonly;
@ -41,7 +38,7 @@ struct TownResolverObject : public ResolverObject {
{
switch (scope) {
case VSG_SCOPE_SELF: return &town_scope;
default: return &this->default_scope; // XXX return ResolverObject::GetScope(scope, relative);
default: return ResolverObject::GetScope(scope, relative);
}
}
};

7
src/table/newgrf_debug_data.h
Unescape Escape View File

@ -491,10 +491,15 @@ class NIHTown : public NIHelper {
const void *GetSpec(uint index) const { return NULL; }
void SetStringParameters(uint index) const { this->SetSimpleStringParameters(STR_TOWN_NAME, index); }
uint32 GetGRFID(uint index) const { return 0; }
uint Resolve(uint index, uint var, uint param, bool *avail) const { return TownGetVariable(var, param, avail, Town::Get(index), NULL); }
bool PSAWithParameter() const { return true; }
uint GetPSASize(uint index, uint32 grfid) const { return cpp_lengthof(PersistentStorage, storage); }
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
{
TownResolverObject ro(NULL, Town::Get(index), true);
return ro.GetScope(ro.scope)->GetVariable(var, param, avail);
}
const int32 *GetPSAFirstPosition(uint index, uint32 grfid) const
{
Town *t = Town::Get(index);

Write Preview
Loading…
Cancel
Save