mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r24685) -Codechange: Add resolver classes for rail types.
This commit is contained in:
parent
c417efc962
commit
82e6001451
|
@ -32,6 +32,7 @@
|
||||||
#include "newgrf_spritegroup.h"
|
#include "newgrf_spritegroup.h"
|
||||||
#include "newgrf_station.h"
|
#include "newgrf_station.h"
|
||||||
#include "newgrf_town.h"
|
#include "newgrf_town.h"
|
||||||
|
#include "newgrf_railtype.h"
|
||||||
|
|
||||||
#include "widgets/newgrf_debug_widget.h"
|
#include "widgets/newgrf_debug_widget.h"
|
||||||
|
|
||||||
|
|
|
@ -11,32 +11,20 @@
|
||||||
|
|
||||||
#include "stdafx.h"
|
#include "stdafx.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "newgrf_spritegroup.h"
|
#include "newgrf_railtype.h"
|
||||||
#include "date_func.h"
|
#include "date_func.h"
|
||||||
#include "depot_base.h"
|
#include "depot_base.h"
|
||||||
#include "town.h"
|
#include "town.h"
|
||||||
|
|
||||||
static uint32 RailTypeGetRandomBits(const ResolverObject *object)
|
/* virtual */ uint32 RailTypeScopeResolver::GetRandomBits() const
|
||||||
{
|
{
|
||||||
TileIndex tile = object->u.routes.tile;
|
uint tmp = CountBits(this->tile + (TileX(this->tile) + TileY(this->tile)) * TILE_SIZE);
|
||||||
uint tmp = CountBits(tile + (TileX(tile) + TileY(tile)) * TILE_SIZE);
|
|
||||||
return GB(tmp, 0, 2);
|
return GB(tmp, 0, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32 RailTypeGetTriggers(const ResolverObject *object)
|
/* virtual */ uint32 RailTypeScopeResolver::GetVariable(byte variable, uint32 parameter, bool *available) const
|
||||||
{
|
{
|
||||||
return 0;
|
if (this->tile == INVALID_TILE) {
|
||||||
}
|
|
||||||
|
|
||||||
static void RailTypeSetTriggers(const ResolverObject *object, int triggers)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static uint32 RailTypeGetVariable(const ResolverObject *object, byte variable, uint32 parameter, bool *available)
|
|
||||||
{
|
|
||||||
TileIndex tile = object->u.routes.tile;
|
|
||||||
|
|
||||||
if (tile == INVALID_TILE) {
|
|
||||||
switch (variable) {
|
switch (variable) {
|
||||||
case 0x40: return 0;
|
case 0x40: return 0;
|
||||||
case 0x41: return 0;
|
case 0x41: return 0;
|
||||||
|
@ -47,20 +35,20 @@ static uint32 RailTypeGetVariable(const ResolverObject *object, byte variable, u
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (variable) {
|
switch (variable) {
|
||||||
case 0x40: return GetTerrainType(tile, object->u.routes.context);
|
case 0x40: return GetTerrainType(this->tile, this->context);
|
||||||
case 0x41: return 0;
|
case 0x41: return 0;
|
||||||
case 0x42: return IsLevelCrossingTile(tile) && IsCrossingBarred(tile);
|
case 0x42: return IsLevelCrossingTile(this->tile) && IsCrossingBarred(this->tile);
|
||||||
case 0x43:
|
case 0x43:
|
||||||
if (IsRailDepotTile(tile)) return Depot::GetByTile(tile)->build_date;
|
if (IsRailDepotTile(this->tile)) return Depot::GetByTile(this->tile)->build_date;
|
||||||
return _date;
|
return _date;
|
||||||
case 0x44: {
|
case 0x44: {
|
||||||
const Town *t = NULL;
|
const Town *t = NULL;
|
||||||
if (IsRailDepotTile(tile)) {
|
if (IsRailDepotTile(this->tile)) {
|
||||||
t = Depot::GetByTile(tile)->town;
|
t = Depot::GetByTile(this->tile)->town;
|
||||||
} else if (IsLevelCrossingTile(tile)) {
|
} else if (IsLevelCrossingTile(this->tile)) {
|
||||||
t = ClosestTownFromTile(tile, UINT_MAX);
|
t = ClosestTownFromTile(this->tile, UINT_MAX);
|
||||||
}
|
}
|
||||||
return t != NULL ? GetTownRadiusGroup(t, tile) : HZB_TOWN_EDGE;
|
return t != NULL ? GetTownRadiusGroup(t, this->tile) : HZB_TOWN_EDGE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,30 +58,22 @@ static uint32 RailTypeGetVariable(const ResolverObject *object, byte variable, u
|
||||||
return UINT_MAX;
|
return UINT_MAX;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const SpriteGroup *RailTypeResolveReal(const ResolverObject *object, const RealSpriteGroup *group)
|
/* virtual */ const SpriteGroup *RailTypeResolverObject::ResolveReal(const RealSpriteGroup *group) const
|
||||||
{
|
{
|
||||||
if (group->num_loading > 0) return group->loading[0];
|
if (group->num_loading > 0) return group->loading[0];
|
||||||
if (group->num_loaded > 0) return group->loaded[0];
|
if (group->num_loaded > 0) return group->loaded[0];
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void NewRailTypeResolver(ResolverObject *res, TileIndex tile, TileContext context, const GRFFile *grffile, uint32 param1 = 0, uint32 param2 = 0)
|
RailTypeScopeResolver::RailTypeScopeResolver(ResolverObject *ro, TileIndex tile, TileContext context) : ScopeResolver(ro)
|
||||||
{
|
{
|
||||||
res->GetRandomBits = &RailTypeGetRandomBits;
|
this->tile = tile;
|
||||||
res->GetTriggers = &RailTypeGetTriggers;
|
this->context = context;
|
||||||
res->SetTriggers = &RailTypeSetTriggers;
|
}
|
||||||
res->GetVariable = &RailTypeGetVariable;
|
|
||||||
res->ResolveRealMethod = &RailTypeResolveReal;
|
|
||||||
|
|
||||||
res->u.routes.tile = tile;
|
RailTypeResolverObject::RailTypeResolverObject(TileIndex tile, TileContext context, const GRFFile *grffile, uint32 param1, uint32 param2)
|
||||||
res->u.routes.context = context;
|
: ResolverObject(grffile, CBID_NO_CALLBACK, param1, param2), railtype_scope(this, tile, context)
|
||||||
|
{
|
||||||
res->callback = CBID_NO_CALLBACK;
|
|
||||||
res->callback_param1 = param1;
|
|
||||||
res->callback_param2 = param2;
|
|
||||||
res->ResetState();
|
|
||||||
|
|
||||||
res->grffile = grffile;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -110,12 +90,8 @@ SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSp
|
||||||
|
|
||||||
if (rti->group[rtsg] == NULL) return 0;
|
if (rti->group[rtsg] == NULL) return 0;
|
||||||
|
|
||||||
const SpriteGroup *group;
|
RailTypeResolverObject object(tile, context, rti->grffile[rtsg]);
|
||||||
ResolverObject object;
|
const SpriteGroup *group = SpriteGroup::Resolve(rti->group[rtsg], &object);
|
||||||
|
|
||||||
NewRailTypeResolver(&object, tile, context, rti->grffile[rtsg]);
|
|
||||||
|
|
||||||
group = SpriteGroup::Resolve(rti->group[rtsg], &object);
|
|
||||||
if (group == NULL || group->GetNumResults() == 0) return 0;
|
if (group == NULL || group->GetNumResults() == 0) return 0;
|
||||||
|
|
||||||
return group->GetResult();
|
return group->GetResult();
|
||||||
|
@ -135,11 +111,9 @@ SpriteID GetCustomSignalSprite(const RailtypeInfo *rti, TileIndex tile, SignalTy
|
||||||
{
|
{
|
||||||
if (rti->group[RTSG_SIGNALS] == NULL) return 0;
|
if (rti->group[RTSG_SIGNALS] == NULL) return 0;
|
||||||
|
|
||||||
ResolverObject object;
|
|
||||||
|
|
||||||
uint32 param1 = gui ? 0x10 : 0x00;
|
uint32 param1 = gui ? 0x10 : 0x00;
|
||||||
uint32 param2 = (type << 16) | (var << 8) | state;
|
uint32 param2 = (type << 16) | (var << 8) | state;
|
||||||
NewRailTypeResolver(&object, tile, TCX_NORMAL, rti->grffile[RTSG_SIGNALS], param1, param2);
|
RailTypeResolverObject object(tile, TCX_NORMAL, rti->grffile[RTSG_SIGNALS], param1, param2);
|
||||||
|
|
||||||
const SpriteGroup *group = SpriteGroup::Resolve(rti->group[RTSG_SIGNALS], &object);
|
const SpriteGroup *group = SpriteGroup::Resolve(rti->group[RTSG_SIGNALS], &object);
|
||||||
if (group == NULL || group->GetNumResults() == 0) return 0;
|
if (group == NULL || group->GetNumResults() == 0) return 0;
|
||||||
|
@ -166,15 +140,3 @@ uint8 GetReverseRailTypeTranslation(RailType railtype, const GRFFile *grffile)
|
||||||
/* If not found, return as invalid */
|
/* If not found, return as invalid */
|
||||||
return 0xFF;
|
return 0xFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolve a railtypes's spec and such so we can get a variable.
|
|
||||||
* @param ro The resolver object to fill.
|
|
||||||
* @param index The rail tile to get the data from.
|
|
||||||
*/
|
|
||||||
void GetRailTypeResolver(ResolverObject *ro, uint index)
|
|
||||||
{
|
|
||||||
/* There is no unique GRFFile for the tile. Multiple GRFs can define different parts of the railtype.
|
|
||||||
* However, currently the NewGRF Debug GUI does not display variables depending on the GRF (like 0x7F) anyway. */
|
|
||||||
NewRailTypeResolver(ro, index, TCX_NORMAL, NULL);
|
|
||||||
}
|
|
||||||
|
|
|
@ -14,6 +14,35 @@
|
||||||
|
|
||||||
#include "rail.h"
|
#include "rail.h"
|
||||||
#include "newgrf_commons.h"
|
#include "newgrf_commons.h"
|
||||||
|
#include "newgrf_spritegroup.h"
|
||||||
|
|
||||||
|
|
||||||
|
struct RailTypeScopeResolver : public ScopeResolver {
|
||||||
|
TileIndex tile; ///< Tracktile. For track on a bridge this is the southern bridgehead.
|
||||||
|
TileContext context; ///< Are we resolving sprites for the upper halftile, or on a bridge?
|
||||||
|
|
||||||
|
RailTypeScopeResolver(ResolverObject *ro, TileIndex tile, TileContext context);
|
||||||
|
|
||||||
|
/* virtual */ uint32 GetRandomBits() const;
|
||||||
|
/* virtual */ uint32 GetVariable(byte variable, uint32 parameter, bool *available) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Resolver object for rail types. */
|
||||||
|
struct RailTypeResolverObject : public ResolverObject {
|
||||||
|
RailTypeScopeResolver railtype_scope;
|
||||||
|
|
||||||
|
RailTypeResolverObject(TileIndex tile, TileContext context, const GRFFile *grffile, uint32 param1 = 0, uint32 param2 = 0);
|
||||||
|
|
||||||
|
/* virtual */ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0)
|
||||||
|
{
|
||||||
|
switch (scope) {
|
||||||
|
case VSG_SCOPE_SELF: return &this->railtype_scope;
|
||||||
|
default: return &this->default_scope; // XXX ResolverObject::GetScope(scope, relative);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
|
||||||
|
};
|
||||||
|
|
||||||
SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSpriteGroup rtsg, TileContext context = TCX_NORMAL);
|
SpriteID GetCustomRailSprite(const RailtypeInfo *rti, TileIndex tile, RailTypeSpriteGroup rtsg, TileContext context = TCX_NORMAL);
|
||||||
SpriteID GetCustomSignalSprite(const RailtypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, SignalState state, bool gui = false);
|
SpriteID GetCustomSignalSprite(const RailtypeInfo *rti, TileIndex tile, SignalType type, SignalVariant var, SignalState state, bool gui = false);
|
||||||
|
|
|
@ -373,10 +373,6 @@ struct ResolverObject {
|
||||||
uint8 count;
|
uint8 count;
|
||||||
uint8 station_size;
|
uint8 station_size;
|
||||||
} generic;
|
} generic;
|
||||||
struct {
|
|
||||||
TileIndex tile; ///< Tracktile. For track on a bridge this is the southern bridgehead.
|
|
||||||
TileContext context; ///< Are we resolving sprites for the upper halftile, or on a bridge?
|
|
||||||
} routes;
|
|
||||||
struct {
|
struct {
|
||||||
struct Station *st; ///< Station of the airport for which the callback is run, or NULL for build gui.
|
struct Station *st; ///< Station of the airport for which the callback is run, or NULL for build gui.
|
||||||
byte airport_id; ///< Type of airport for which the callback is run
|
byte airport_id; ///< Type of airport for which the callback is run
|
||||||
|
|
|
@ -398,7 +398,14 @@ class NIHRailType : public NIHelper {
|
||||||
const void *GetSpec(uint index) const { return NULL; }
|
const void *GetSpec(uint index) const { return NULL; }
|
||||||
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE, INVALID_STRING_ID, index); }
|
void SetStringParameters(uint index) const { this->SetObjectAtStringParameters(STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_RAIL_TYPE, INVALID_STRING_ID, index); }
|
||||||
uint32 GetGRFID(uint index) const { return 0; }
|
uint32 GetGRFID(uint index) const { return 0; }
|
||||||
void Resolve(ResolverObject *ro, uint32 index) const { extern void GetRailTypeResolver(ResolverObject *ro, uint index); GetRailTypeResolver(ro, index); }
|
|
||||||
|
/* virtual */ uint Resolve(uint index, uint var, uint param, bool *avail) const
|
||||||
|
{
|
||||||
|
/* There is no unique GRFFile for the tile. Multiple GRFs can define different parts of the railtype.
|
||||||
|
* However, currently the NewGRF Debug GUI does not display variables depending on the GRF (like 0x7F) anyway. */
|
||||||
|
RailTypeResolverObject ro(index, TCX_NORMAL, NULL);
|
||||||
|
return ro.GetScope(ro.scope)->GetVariable(var, param, avail);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
static const NIFeature _nif_railtype = {
|
static const NIFeature _nif_railtype = {
|
||||||
|
|
Loading…
Reference in New Issue