Merge branch 'master' into jgrpp

Remove 'byte' typedef
This commit is contained in:
Jonathan G Rennison
2024-05-07 17:21:50 +01:00
376 changed files with 2220 additions and 2152 deletions

View File

@@ -260,10 +260,10 @@ void UpdateNewGRFConfigPalette(int32_t new_value)
*/
size_t GRFGetSizeOfDataSection(FILE *f)
{
extern const byte _grf_cont_v2_sig[];
extern const uint8_t _grf_cont_v2_sig[];
static const uint header_len = 14;
byte data[header_len];
uint8_t data[header_len];
if (fread(data, 1, header_len, f) == header_len) {
if (data[0] == 0 && data[1] == 0 && MemCmpT(data + 2, _grf_cont_v2_sig, 8) == 0) {
/* Valid container version 2, get data section size. */