mirror of https://github.com/OpenTTD/OpenTTD.git
Codechange: Sprite mapping for objects doesn't involve cargo types. (#10905)
Objects have a default sprite group and an optional purchase list sprite group. There is no need to pretend that these are cargo IDs.
This commit is contained in:
parent
cdb3a6288b
commit
0b663f709d
|
@ -5504,15 +5504,6 @@ static void NewSpriteGroup(ByteReader *buf)
|
||||||
|
|
||||||
static CargoID TranslateCargo(uint8 feature, uint8 ctype)
|
static CargoID TranslateCargo(uint8 feature, uint8 ctype)
|
||||||
{
|
{
|
||||||
if (feature == GSF_OBJECTS) {
|
|
||||||
switch (ctype) {
|
|
||||||
case 0: return 0;
|
|
||||||
case 0xFF: return CT_PURCHASE_OBJECT;
|
|
||||||
default:
|
|
||||||
GrfMsg(1, "TranslateCargo: Invalid cargo bitnum {} for objects, skipping.", ctype);
|
|
||||||
return CT_INVALID;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
/* Special cargo types for purchase list and stations */
|
/* Special cargo types for purchase list and stations */
|
||||||
if ((feature == GSF_STATIONS || feature == GSF_ROADSTOPS) && ctype == 0xFE) return CT_DEFAULT_NA;
|
if ((feature == GSF_STATIONS || feature == GSF_ROADSTOPS) && ctype == 0xFE) return CT_DEFAULT_NA;
|
||||||
if (ctype == 0xFF) return CT_PURCHASE;
|
if (ctype == 0xFF) return CT_PURCHASE;
|
||||||
|
@ -5878,8 +5869,11 @@ static void ObjectMapSpriteGroup(ByteReader *buf, uint8 idcount)
|
||||||
uint16 groupid = buf->ReadWord();
|
uint16 groupid = buf->ReadWord();
|
||||||
if (!IsValidGroupID(groupid, "ObjectMapSpriteGroup")) continue;
|
if (!IsValidGroupID(groupid, "ObjectMapSpriteGroup")) continue;
|
||||||
|
|
||||||
ctype = TranslateCargo(GSF_OBJECTS, ctype);
|
/* The only valid option here is purchase list sprite groups. */
|
||||||
if (!IsValidCargoID(ctype)) continue;
|
if (ctype != 0xFF) {
|
||||||
|
GrfMsg(1, "ObjectMapSpriteGroup: Invalid cargo bitnum {} for objects, skipping.", ctype);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
for (auto &object : objects) {
|
for (auto &object : objects) {
|
||||||
ObjectSpec *spec = object >= _cur.grffile->objectspec.size() ? nullptr : _cur.grffile->objectspec[object].get();
|
ObjectSpec *spec = object >= _cur.grffile->objectspec.size() ? nullptr : _cur.grffile->objectspec[object].get();
|
||||||
|
@ -5889,7 +5883,7 @@ static void ObjectMapSpriteGroup(ByteReader *buf, uint8 idcount)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
spec->grf_prop.spritegroup[ctype] = _cur.spritegroups[groupid];
|
spec->grf_prop.spritegroup[OBJECT_SPRITE_GROUP_PURCHASE] = _cur.spritegroups[groupid];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5909,9 +5903,9 @@ static void ObjectMapSpriteGroup(ByteReader *buf, uint8 idcount)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
spec->grf_prop.spritegroup[0] = _cur.spritegroups[groupid];
|
spec->grf_prop.spritegroup[OBJECT_SPRITE_GROUP_DEFAULT] = _cur.spritegroups[groupid];
|
||||||
spec->grf_prop.grffile = _cur.grffile;
|
spec->grf_prop.grffile = _cur.grffile;
|
||||||
spec->grf_prop.local_id = object;
|
spec->grf_prop.local_id = object;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -378,8 +378,8 @@ ObjectResolverObject::ObjectResolverObject(const ObjectSpec *spec, Object *obj,
|
||||||
: ResolverObject(spec->grf_prop.grffile, callback, param1, param2), object_scope(*this, obj, spec, tile, view)
|
: ResolverObject(spec->grf_prop.grffile, callback, param1, param2), object_scope(*this, obj, spec, tile, view)
|
||||||
{
|
{
|
||||||
this->town_scope = nullptr;
|
this->town_scope = nullptr;
|
||||||
this->root_spritegroup = (obj == nullptr && spec->grf_prop.spritegroup[CT_PURCHASE_OBJECT] != nullptr) ?
|
this->root_spritegroup = (obj == nullptr && spec->grf_prop.spritegroup[OBJECT_SPRITE_GROUP_PURCHASE] != nullptr) ?
|
||||||
spec->grf_prop.spritegroup[CT_PURCHASE_OBJECT] : spec->grf_prop.spritegroup[0];
|
spec->grf_prop.spritegroup[OBJECT_SPRITE_GROUP_PURCHASE] : spec->grf_prop.spritegroup[OBJECT_SPRITE_GROUP_DEFAULT];
|
||||||
}
|
}
|
||||||
|
|
||||||
ObjectResolverObject::~ObjectResolverObject()
|
ObjectResolverObject::~ObjectResolverObject()
|
||||||
|
|
|
@ -166,8 +166,8 @@ private:
|
||||||
/** Struct containing information relating to object classes. */
|
/** Struct containing information relating to object classes. */
|
||||||
typedef NewGRFClass<ObjectSpec, ObjectClassID, OBJECT_CLASS_MAX> ObjectClass;
|
typedef NewGRFClass<ObjectSpec, ObjectClassID, OBJECT_CLASS_MAX> ObjectClass;
|
||||||
|
|
||||||
/** Mapping of purchase for objects. */
|
static const size_t OBJECT_SPRITE_GROUP_DEFAULT = 0;
|
||||||
static const CargoID CT_PURCHASE_OBJECT = 1;
|
static const size_t OBJECT_SPRITE_GROUP_PURCHASE = 1;
|
||||||
|
|
||||||
uint16 GetObjectCallback(CallbackID callback, uint32 param1, uint32 param2, const ObjectSpec *spec, Object *o, TileIndex tile, uint8 view = 0);
|
uint16 GetObjectCallback(CallbackID callback, uint32 param1, uint32 param2, const ObjectSpec *spec, Object *o, TileIndex tile, uint8 view = 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue