Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r13364) -Codechange: Refactor action 3 mapping to use grf_load_*() instead of direct byte array access.

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
peter1138 17 years ago
parent 86ab690ec5
commit 7b66180d78
1 changed files with 142 additions and 105 deletions
Show Stats Download Patch File Download Diff File

247
src/newgrf.cpp
Unescape Escape View File

@ -2917,17 +2917,18 @@ static bool IsValidGroupID(uint16 groupid, const char *function)
} }
static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount, uint8 cidcount, bool wagover) static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount)
{ {
static EngineID *last_engines; static EngineID *last_engines;
static uint last_engines_count; static uint last_engines_count;
bool wagover = false;
/* Test for 'wagon override' flag */
if (HasBit(idcount, 7)) {
wagover = true;
/* Strip off the flag */
idcount = GB(idcount, 0, 7);
if (!wagover) {
if (last_engines_count != idcount) {
last_engines = ReallocT(last_engines, idcount);
last_engines_count = idcount;
}
} else {
if (last_engines_count == 0) { if (last_engines_count == 0) {
grfmsg(0, "VehicleMapSpriteGroup: WagonOverride: No engine to do override with"); grfmsg(0, "VehicleMapSpriteGroup: WagonOverride: No engine to do override with");
return; return;
@ -2935,64 +2936,76 @@ static void VehicleMapSpriteGroup(byte *buf, byte feature, uint8 idcount, uint8
grfmsg(6, "VehicleMapSpriteGroup: WagonOverride: %u engines, %u wagons", grfmsg(6, "VehicleMapSpriteGroup: WagonOverride: %u engines, %u wagons",
last_engines_count, idcount); last_engines_count, idcount);
} else {
if (last_engines_count != idcount) {
last_engines = ReallocT(last_engines, idcount);
last_engines_count = idcount;
}
} }
EngineID engines[idcount];
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
uint8 engine_id = buf[3 + i]; engines[i] = GetNewEngine(_cur_grffile, (VehicleType)feature, grf_load_byte(&buf))->index;
EngineID engine = GetNewEngine(_cur_grffile, (VehicleType)feature, engine_id)->index; if (!wagover) last_engines[i] = engines[i];
byte *bp = &buf[4 + idcount]; }
grfmsg(7, "VehicleMapSpriteGroup: [%d] Engine %d...", i, engine); uint8 cidcount = grf_load_byte(&buf);
for (uint c = 0; c < cidcount; c++) {
uint8 ctype = grf_load_byte(&buf);
uint16 groupid = grf_load_word(&buf);
if (!IsValidGroupID(groupid, "VehicleMapSpriteGroup")) continue;
for (uint c = 0; c < cidcount; c++) { grfmsg(8, "VehicleMapSpriteGroup: * [%d] Cargo type 0x%X, group id 0x%02X", c, ctype, groupid);
uint8 ctype = grf_load_byte(&bp);
uint16 groupid = grf_load_word(&bp);
if (!IsValidGroupID(groupid, "VehicleMapSpriteGroup")) continue;
grfmsg(8, "VehicleMapSpriteGroup: * [%d] Cargo type 0x%X, group id 0x%02X", c, ctype, groupid); ctype = TranslateCargo(feature, ctype);
if (ctype == CT_INVALID) continue;
ctype = TranslateCargo(feature, ctype); for (uint i = 0; i < idcount; i++) {
if (ctype == CT_INVALID) continue; EngineID engine = engines[i];
grfmsg(7, "VehicleMapSpriteGroup: [%d] Engine %d...", i, engine);
if (wagover) { if (wagover) {
SetWagonOverrideSprites(engine, ctype, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count); SetWagonOverrideSprites(engine, ctype, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count);
} else { } else {
SetCustomEngineSprites(engine, ctype, _cur_grffile->spritegroups[groupid]); SetCustomEngineSprites(engine, ctype, _cur_grffile->spritegroups[groupid]);
last_engines[i] = engine;
} }
} }
} }
{ uint16 groupid = grf_load_word(&buf);
byte *bp = &buf[4 + idcount + cidcount * 3]; if (!IsValidGroupID(groupid, "VehicleMapSpriteGroup")) return;
uint16 groupid = grf_load_word(&bp);
if (!IsValidGroupID(groupid, "VehicleMapSpriteGroup")) return;
grfmsg(8, "-- Default group id 0x%04X", groupid); grfmsg(8, "-- Default group id 0x%04X", groupid);
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
EngineID engine = GetNewEngine(_cur_grffile, (VehicleType)feature, buf[3 + i])->index; EngineID engine = engines[i];
if (wagover) { if (wagover) {
SetWagonOverrideSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count); SetWagonOverrideSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid], last_engines, last_engines_count);
} else { } else {
SetCustomEngineSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid]); SetCustomEngineSprites(engine, CT_DEFAULT, _cur_grffile->spritegroups[groupid]);
SetEngineGRF(engine, _cur_grffile); SetEngineGRF(engine, _cur_grffile);
last_engines[i] = engine;
}
} }
} }
} }
static void CanalMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) static void CanalMapSpriteGroup(byte *buf, uint8 idcount)
{ {
byte *bp = &buf[4 + idcount + cidcount * 3]; CanalFeature cfs[idcount];
uint16 groupid = grf_load_word(&bp); for (uint i = 0; i < idcount; i++) {
cfs[i] = (CanalFeature)grf_load_byte(&buf);
}
uint8 cidcount = grf_load_byte(&buf);
buf += cidcount * 3;
uint16 groupid = grf_load_word(&buf);
if (!IsValidGroupID(groupid, "CanalMapSpriteGroup")) return; if (!IsValidGroupID(groupid, "CanalMapSpriteGroup")) return;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
CanalFeature cf = (CanalFeature)buf[3 + i]; CanalFeature cf = cfs[i];
if (cf >= CF_END) { if (cf >= CF_END) {
grfmsg(1, "CanalMapSpriteGroup: Canal subset %d out of range, skipping", cf); grfmsg(1, "CanalMapSpriteGroup: Canal subset %d out of range, skipping", cf);
@ -3004,62 +3017,69 @@ static void CanalMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
} }
static void StationMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) static void StationMapSpriteGroup(byte *buf, uint8 idcount)
{ {
uint8 stations[idcount];
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
uint8 stid = buf[3 + i]; stations[i] = grf_load_byte(&buf);
StationSpec *statspec = _cur_grffile->stations[stid]; }
if (statspec == NULL) { uint8 cidcount = grf_load_byte(&buf);
grfmsg(1, "StationMapSpriteGroup: Station with ID 0x%02X does not exist, skipping", stid); for (uint c = 0; c < cidcount; c++) {
return; uint8 ctype = grf_load_byte(&buf);
} uint16 groupid = grf_load_word(&buf);
if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) continue;
byte *bp = &buf[4 + idcount]; ctype = TranslateCargo(GSF_STATION, ctype);
if (ctype == CT_INVALID) continue;
for (uint c = 0; c < cidcount; c++) { for (uint i = 0; i < idcount; i++) {
uint8 ctype = grf_load_byte(&bp); StationSpec *statspec = _cur_grffile->stations[stations[i]];
uint16 groupid = grf_load_word(&bp);
if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) continue;
ctype = TranslateCargo(GSF_STATION, ctype); if (statspec == NULL) {
if (ctype == CT_INVALID) continue; grfmsg(1, "StationMapSpriteGroup: Station with ID 0x%02X does not exist, skipping", stations[i]);
return;
}
statspec->spritegroup[ctype] = _cur_grffile->spritegroups[groupid]; statspec->spritegroup[ctype] = _cur_grffile->spritegroups[groupid];
} }
} }
{ uint16 groupid = grf_load_word(&buf);
byte *bp = &buf[4 + idcount + cidcount * 3]; if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) return;
uint16 groupid = grf_load_word(&bp);
if (!IsValidGroupID(groupid, "StationMapSpriteGroup")) return;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
uint8 stid = buf[3 + i]; StationSpec *statspec = _cur_grffile->stations[stations[i]];
StationSpec *statspec = _cur_grffile->stations[stid];
if (statspec == NULL) {
grfmsg(1, "StationMapSpriteGroup: Station with ID 0x%02X does not exist, skipping", stid);
continue;
}
statspec->spritegroup[CT_DEFAULT] = _cur_grffile->spritegroups[groupid]; if (statspec == NULL) {
statspec->grffile = _cur_grffile; grfmsg(1, "StationMapSpriteGroup: Station with ID 0x%02X does not exist, skipping", stations[i]);
statspec->localidx = stid; continue;
SetCustomStationSpec(statspec);
} }
statspec->spritegroup[CT_DEFAULT] = _cur_grffile->spritegroups[groupid];
statspec->grffile = _cur_grffile;
statspec->localidx = stations[i];
SetCustomStationSpec(statspec);
} }
} }
static void TownHouseMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) static void TownHouseMapSpriteGroup(byte *buf, uint8 idcount)
{ {
byte *bp = &buf[4 + idcount + cidcount * 3]; uint8 houses[idcount];
uint16 groupid = grf_load_word(&bp); for (uint i = 0; i < idcount; i++) {
houses[i] = grf_load_byte(&buf);
}
/* Skip the cargo type section, we only care about the default group */
uint8 cidcount = grf_load_byte(&buf);
buf += cidcount * 3;
uint16 groupid = grf_load_word(&buf);
if (!IsValidGroupID(groupid, "TownHouseMapSpriteGroup")) return; if (!IsValidGroupID(groupid, "TownHouseMapSpriteGroup")) return;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
uint8 hid = buf[3 + i]; HouseSpec *hs = _cur_grffile->housespec[houses[i]];
HouseSpec *hs = _cur_grffile->housespec[hid];
if (hs == NULL) { if (hs == NULL) {
grfmsg(1, "TownHouseMapSpriteGroup: Too many houses defined, skipping"); grfmsg(1, "TownHouseMapSpriteGroup: Too many houses defined, skipping");
@ -3070,15 +3090,22 @@ static void TownHouseMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
} }
} }
static void IndustryMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) static void IndustryMapSpriteGroup(byte *buf, uint8 idcount)
{ {
byte *bp = &buf[4 + idcount + cidcount * 3]; uint8 industries[idcount];
uint16 groupid = grf_load_word(&bp); for (uint i = 0; i < idcount; i++) {
industries[i] = grf_load_byte(&buf);
}
/* Skip the cargo type section, we only care about the default group */
uint8 cidcount = grf_load_byte(&buf);
buf += cidcount * 3;
uint16 groupid = grf_load_word(&buf);
if (!IsValidGroupID(groupid, "IndustryMapSpriteGroup")) return; if (!IsValidGroupID(groupid, "IndustryMapSpriteGroup")) return;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
uint8 id = buf[3 + i]; IndustrySpec *indsp = _cur_grffile->industryspec[industries[i]];
IndustrySpec *indsp = _cur_grffile->industryspec[id];
if (indsp == NULL) { if (indsp == NULL) {
grfmsg(1, "IndustryMapSpriteGroup: Too many industries defined, skipping"); grfmsg(1, "IndustryMapSpriteGroup: Too many industries defined, skipping");
@ -3089,15 +3116,22 @@ static void IndustryMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
} }
} }
static void IndustrytileMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) static void IndustrytileMapSpriteGroup(byte *buf, uint8 idcount)
{ {
byte *bp = &buf[4 + idcount + cidcount * 3]; uint8 indtiles[idcount];
uint16 groupid = grf_load_word(&bp); for (uint i = 0; i < idcount; i++) {
indtiles[i] = grf_load_byte(&buf);
}
/* Skip the cargo type section, we only care about the default group */
uint8 cidcount = grf_load_byte(&buf);
buf += cidcount * 3;
uint16 groupid = grf_load_word(&buf);
if (!IsValidGroupID(groupid, "IndustrytileMapSpriteGroup")) return; if (!IsValidGroupID(groupid, "IndustrytileMapSpriteGroup")) return;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
uint8 id = buf[3 + i]; IndustryTileSpec *indtsp = _cur_grffile->indtspec[indtiles[i]];
IndustryTileSpec *indtsp = _cur_grffile->indtspec[id];
if (indtsp == NULL) { if (indtsp == NULL) {
grfmsg(1, "IndustrytileMapSpriteGroup: Too many industry tiles defined, skipping"); grfmsg(1, "IndustrytileMapSpriteGroup: Too many industry tiles defined, skipping");
@ -3108,17 +3142,25 @@ static void IndustrytileMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount)
} }
} }
static void CargoMapSpriteGroup(byte *buf, uint8 idcount, uint8 cidcount) static void CargoMapSpriteGroup(byte *buf, uint8 idcount)
{ {
byte *bp = &buf[4 + idcount + cidcount * 3]; CargoID cargos[idcount];
uint16 groupid = grf_load_word(&bp); for (uint i = 0; i < idcount; i++) {
cargos[i] = grf_load_byte(&buf);
}
/* Skip the cargo type section, we only care about the default group */
uint8 cidcount = grf_load_byte(&buf);
buf += cidcount * 3;
uint16 groupid = grf_load_word(&buf);
if (!IsValidGroupID(groupid, "CargoMapSpriteGroup")) return; if (!IsValidGroupID(groupid, "CargoMapSpriteGroup")) return;
for (uint i = 0; i < idcount; i++) { for (uint i = 0; i < idcount; i++) {
CargoID cid = buf[3 + i]; CargoID cid = cargos[i];
if (cid >= NUM_CARGO) { if (cid >= NUM_CARGO) {
grfmsg(1, "CargoMapSpriteGroup: Cargo ID %d out of range, skipping"); grfmsg(1, "CargoMapSpriteGroup: Cargo ID %d out of range, skipping", cid);
continue; continue;
} }
@ -3153,16 +3195,15 @@ static void FeatureMapSpriteGroup(byte *buf, size_t len)
if (!check_length(len, 6, "FeatureMapSpriteGroup")) return; if (!check_length(len, 6, "FeatureMapSpriteGroup")) return;
uint8 feature = buf[1]; buf++;
uint8 idcount = buf[2] & 0x7F; uint8 feature = grf_load_byte(&buf);
bool wagover = (buf[2] & 0x80) == 0x80; uint8 idcount = grf_load_byte(&buf);
if (!check_length(len, 3 + idcount, "FeatureMapSpriteGroup")) return;
/* If idcount is zero, this is a feature callback */ /* If idcount is zero, this is a feature callback */
if (idcount == 0) { if (idcount == 0) {
byte *bp = &buf[4]; /* Skip number of cargo ids? */
uint16 groupid = grf_load_word(&bp); grf_load_byte(&buf);
uint16 groupid = grf_load_word(&buf);
grfmsg(6, "FeatureMapSpriteGroup: Adding generic feature callback for feature %d", feature); grfmsg(6, "FeatureMapSpriteGroup: Adding generic feature callback for feature %d", feature);
@ -3170,42 +3211,38 @@ static void FeatureMapSpriteGroup(byte *buf, size_t len)
return; return;
} }
uint8 cidcount = buf[3 + idcount]; grfmsg(6, "FeatureMapSpriteGroup: Feature %d, %d ids", feature, idcount);
if (!check_length(len, 4 + idcount + cidcount * 3, "FeatureMapSpriteGroup")) return;
grfmsg(6, "FeatureMapSpriteGroup: Feature %d, %d ids, %d cids, wagon override %d",
feature, idcount, cidcount, wagover);
switch (feature) { switch (feature) {
case GSF_TRAIN: case GSF_TRAIN:
case GSF_ROAD: case GSF_ROAD:
case GSF_SHIP: case GSF_SHIP:
case GSF_AIRCRAFT: case GSF_AIRCRAFT:
VehicleMapSpriteGroup(buf, feature, idcount, cidcount, wagover); VehicleMapSpriteGroup(buf, feature, idcount);
return; return;
case GSF_CANAL: case GSF_CANAL:
CanalMapSpriteGroup(buf, idcount, cidcount); CanalMapSpriteGroup(buf, idcount);
return; return;
case GSF_STATION: case GSF_STATION:
StationMapSpriteGroup(buf, idcount, cidcount); StationMapSpriteGroup(buf, idcount);
return; return;
case GSF_TOWNHOUSE: case GSF_TOWNHOUSE:
TownHouseMapSpriteGroup(buf, idcount, cidcount); TownHouseMapSpriteGroup(buf, idcount);
return; return;
case GSF_INDUSTRIES: case GSF_INDUSTRIES:
IndustryMapSpriteGroup(buf, idcount, cidcount); IndustryMapSpriteGroup(buf, idcount);
return; return;
case GSF_INDUSTRYTILES: case GSF_INDUSTRYTILES:
IndustrytileMapSpriteGroup(buf, idcount, cidcount); IndustrytileMapSpriteGroup(buf, idcount);
return; return;
case GSF_CARGOS: case GSF_CARGOS:
CargoMapSpriteGroup(buf, idcount, cidcount); CargoMapSpriteGroup(buf, idcount);
return; return;
default: default:

Write Preview
Loading…
Cancel
Save