|
@@ -8067,25 +8067,32 @@ static void DecodeSpecialSprite(byte *bu
|
|
|
grfmsg(7, "DecodeSpecialSprite: Skipping action 0x%02X in stage %d", action, stage);
|
|
|
} else {
|
|
|
grfmsg(7, "DecodeSpecialSprite: Handling action 0x%02X in stage %d", action, stage);
|
|
|
handlers[action][stage](bufp);
|
|
|
}
|
|
|
} catch (...) {
|
|
|
grfmsg(1, "DecodeSpecialSprite: Tried to read past end of pseudo-sprite data");
|
|
|
DisableGrf(STR_NEWGRF_ERROR_READ_BOUNDS);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage)
|
|
|
/**
|
|
|
* Load a particular NewGRF.
|
|
|
* @param config The configuration of the to be loaded NewGRF.
|
|
|
* @param file_index The Fio index of the first NewGRF to load.
|
|
|
* @param stage The loading stage of the NewGRF.
|
|
|
* @param subdir The sub directory to find the NewGRF in.
|
|
|
*/
|
|
|
void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage, Subdirectory subdir)
|
|
|
{
|
|
|
const char *filename = config->filename;
|
|
|
uint16 num;
|
|
|
|
|
|
/* A .grf file is activated only if it was active when the game was
|
|
|
* started. If a game is loaded, only its active .grfs will be
|
|
|
* reactivated, unless "loadallgraphics on" is used. A .grf file is
|
|
|
* considered active if its action 8 has been processed, i.e. its
|
|
|
* action 8 hasn't been skipped using an action 7.
|
|
|
*
|
|
|
* During activation, only actions 0, 1, 2, 3, 4, 5, 7, 8, 9, 0A and 0B are
|
|
|
* carried out. All others are ignored, because they only need to be
|
|
@@ -8096,25 +8103,25 @@ void LoadNewGRFFile(GRFConfig *config, u
|
|
|
if (stage == GLS_RESERVE && config->status != GCS_INITIALISED) return;
|
|
|
if (stage == GLS_ACTIVATION && !HasBit(config->flags, GCF_RESERVED)) return;
|
|
|
_cur.grffile->is_ottdfile = config->IsOpenTTDBaseGRF();
|
|
|
}
|
|
|
|
|
|
if (file_index > LAST_GRF_SLOT) {
|
|
|
DEBUG(grf, 0, "'%s' is not loaded as the maximum number of GRFs has been reached", filename);
|
|
|
config->status = GCS_DISABLED;
|
|
|
config->error = new GRFError(STR_NEWGRF_ERROR_MSG_FATAL, STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
FioOpenFile(file_index, filename, NEWGRF_DIR);
|
|
|
FioOpenFile(file_index, filename, subdir);
|
|
|
_cur.file_index = file_index; // XXX
|
|
|
_palette_remap_grf[_cur.file_index] = (config->palette & GRFP_USE_MASK);
|
|
|
|
|
|
_cur.grfconfig = config;
|
|
|
|
|
|
DEBUG(grf, 2, "LoadNewGRFFile: Reading NewGRF-file '%s'", filename);
|
|
|
|
|
|
/* Skip the first sprite; we don't care about how many sprites this
|
|
|
* does contain; newest TTDPatches and George's longvehicles don't
|
|
|
* neither, apparently. */
|
|
|
if (FioReadWord() == 4 && FioReadByte() == 0xFF) {
|
|
|
FioReadDword();
|
|
@@ -8395,24 +8402,29 @@ static void AfterLoadGRFs()
|
|
|
}
|
|
|
}
|
|
|
|
|
|
SetYearEngineAgingStops();
|
|
|
|
|
|
FinalisePriceBaseMultipliers();
|
|
|
|
|
|
/* Deallocate temporary loading data */
|
|
|
free(_gted);
|
|
|
_grm_sprites.clear();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Load all the NewGRFs.
|
|
|
* @param load_index The offset for the first sprite to add.
|
|
|
* @param file_index The Fio index of the first NewGRF to load.
|
|
|
*/
|
|
|
void LoadNewGRF(uint load_index, uint file_index)
|
|
|
{
|
|
|
/* In case of networking we need to "sync" the start values
|
|
|
* so all NewGRFs are loaded equally. For this we use the
|
|
|
* start date of the game and we set the counters, etc. to
|
|
|
* 0 so they're the same too. */
|
|
|
Date date = _date;
|
|
|
Year year = _cur_year;
|
|
|
DateFract date_fract = _date_fract;
|
|
|
uint16 tick_counter = _tick_counter;
|
|
|
byte display_opt = _display_opt;
|
|
|
|
|
@@ -8449,32 +8461,33 @@ void LoadNewGRF(uint load_index, uint fi
|
|
|
* This ensures that action7/9 conditions 0x06 - 0x0A work correctly. */
|
|
|
for (GRFConfig *c = _grfconfig; c != NULL; c = c->next) {
|
|
|
if (c->status == GCS_ACTIVATED) c->status = GCS_INITIALISED;
|
|
|
}
|
|
|
|
|
|
uint slot = file_index;
|
|
|
|
|
|
_cur.stage = stage;
|
|
|
for (GRFConfig *c = _grfconfig; c != NULL; c = c->next) {
|
|
|
if (c->status == GCS_DISABLED || c->status == GCS_NOT_FOUND) continue;
|
|
|
if (stage > GLS_INIT && HasBit(c->flags, GCF_INIT_ONLY)) continue;
|
|
|
|
|
|
if (!FioCheckFileExists(c->filename)) {
|
|
|
Subdirectory subdir = slot == file_index ? BASESET_DIR : NEWGRF_DIR;
|
|
|
if (!FioCheckFileExists(c->filename, subdir)) {
|
|
|
DEBUG(grf, 0, "NewGRF file is missing '%s'; disabling", c->filename);
|
|
|
c->status = GCS_NOT_FOUND;
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
if (stage == GLS_LABELSCAN) InitNewGRFFile(c);
|
|
|
LoadNewGRFFile(c, slot++, stage);
|
|
|
LoadNewGRFFile(c, slot++, stage, subdir);
|
|
|
if (stage == GLS_RESERVE) {
|
|
|
SetBit(c->flags, GCF_RESERVED);
|
|
|
} else if (stage == GLS_ACTIVATION) {
|
|
|
ClrBit(c->flags, GCF_RESERVED);
|
|
|
assert(GetFileByGRFID(c->ident.grfid) == _cur.grffile);
|
|
|
ClearTemporaryNewGRFData(_cur.grffile);
|
|
|
BuildCargoTranslationMap();
|
|
|
DEBUG(sprite, 2, "LoadNewGRF: Currently %i sprites are loaded", _cur.spriteid);
|
|
|
} else if (stage == GLS_INIT && HasBit(c->flags, GCF_INIT_ONLY)) {
|
|
|
/* We're not going to activate this, so free whatever data we allocated */
|
|
|
ClearTemporaryNewGRFData(_cur.grffile);
|
|
|
}
|