dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newgrf-property-mapping' into jgrpp

Browse Source 
# Conflicts:
#	docs/newgrf-additions.html
#	src/newgrf.cpp
This commit is contained in:
Jonathan G Rennison
2018-11-28 02:12:33 +00:00
parent a6c5951b2f 7f87e3d61c
commit 5b0cca4b57
4 changed files with 280 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/newgrf.h
View File

@@ -114,11 +114,11 @@ enum Action0RemapPropertyIds {
A0RPI_BRIDGE_PILLAR_FLAGS,
};
enum Action0RemapFallbackMode {
A0REM_IGNORE,
A0REM_ERROR_ON_USE,
A0REM_ERROR_ON_DEFINITION,
A0REM_END,
enum GRFPropertyMapFallbackMode {
GPMFM_IGNORE,
GPMFM_ERROR_ON_USE,
GPMFM_ERROR_ON_DEFINITION,
GPMFM_END,
};
struct GRFPropertyMapDefinition {
@@ -158,6 +158,55 @@ struct GRFFilePropertyRemapSet {
}
};
/** The type of action 5 type. */
enum Action5BlockType {
A5BLOCK_FIXED, ///< Only allow replacing a whole block of sprites. (TTDP compatible)
A5BLOCK_ALLOW_OFFSET, ///< Allow replacing any subset by specifiing an offset.
A5BLOCK_INVALID, ///< unknown/not-implemented type
};
/** Information about a single action 5 type. */
struct Action5Type {
Action5BlockType block_type; ///< How is this Action5 type processed?
SpriteID sprite_base; ///< Load the sprites starting from this sprite.
uint16 min_sprites; ///< If the Action5 contains less sprites, the whole block will be ignored.
uint16 max_sprites; ///< If the Action5 contains more sprites, only the first max_sprites sprites will be used.
const char *name; ///< Name for error messages.
};
struct Action5TypeRemapDefinition {
const char *name; // NULL indicates the end of the list
const Action5Type info;
/** Create empty object used to identify the end of a list. */
Action5TypeRemapDefinition() :
name(NULL),
info({ A5BLOCK_INVALID, 0, 0, 0, NULL })
{}
Action5TypeRemapDefinition(const char *type_name, Action5BlockType block_type, SpriteID sprite_base, uint16 min_sprites, uint16 max_sprites, const char *info_name) :
name(type_name),
info({ block_type, sprite_base, min_sprites, max_sprites, info_name })
{}
};
struct Action5TypeRemapEntry {
const Action5Type *info = nullptr;
const char *name = nullptr;
uint8 type_id = 0;
GRFPropertyMapFallbackMode fallback_mode = GPMFM_IGNORE;
};
struct Action5TypeRemapSet {
std::bitset<256> remapped_ids;
btree::btree_map<uint8, Action5TypeRemapEntry> mapping;
Action5TypeRemapEntry &Entry(uint8 property)
{
this->remapped_ids.set(property);
return this->mapping[property];
}
};
/** Dynamic data of a loaded NewGRF */
struct GRFFile : ZeroedMemoryAllocator {
char *filename;
@@ -176,7 +225,8 @@ struct GRFFile : ZeroedMemoryAllocator {
struct AirportTileSpec **airtspec;
GRFFilePropertyRemapSet action0_property_remaps[GSF_END];
AutoFreeSmallVector<const char *, 8> action0_unknown_property_names;
Action5TypeRemapSet action5_type_remaps;
AutoFreeSmallVector<const char *, 8> remap_unknown_property_names;
uint32 param[0x80];
uint param_end; ///< one more than the highest set parameter