miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: use (better) named constants for the bridge sprite table

Browse Source
This commit is contained in:
Rubidium
2024-12-22 12:50:10 +01:00
committed by rubidium42
parent 2176d49a39
commit 54d58a08f3
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/newgrf.cpp
+6 -6
View File
@@ -2292,21 +2292,21 @@ static ChangeInfoResult BridgeChangeInfo(uint brid, int numinfo, int prop, ByteR
if (bridge->sprite_table == nullptr) {
/* Allocate memory for sprite table pointers and zero out */
bridge->sprite_table = CallocT<PalSpriteID*>(7);
bridge->sprite_table = CallocT<PalSpriteID*>(NUM_BRIDGE_PIECES);
}
for (; numtables-- != 0; tableid++) {
if (tableid >= 7) { // skip invalid data
GrfMsg(1, "BridgeChangeInfo: Table {} >= 7, skipping", tableid);
for (uint8_t sprite = 0; sprite < 32; sprite++) buf.ReadDWord();
if (tableid >= NUM_BRIDGE_PIECES) { // skip invalid data
GrfMsg(1, "BridgeChangeInfo: Table {} >= {}, skipping", tableid, NUM_BRIDGE_PIECES);
for (uint8_t sprite = 0; sprite < SPRITES_PER_BRIDGE_PIECE; sprite++) buf.ReadDWord();
continue;
}
if (bridge->sprite_table[tableid] == nullptr) {
bridge->sprite_table[tableid] = MallocT<PalSpriteID>(32);
bridge->sprite_table[tableid] = MallocT<PalSpriteID>(SPRITES_PER_BRIDGE_PIECE);
}
for (uint8_t sprite = 0; sprite < 32; sprite++) {
for (uint8_t sprite = 0; sprite < SPRITES_PER_BRIDGE_PIECE; sprite++) {
SpriteID image = buf.ReadWord();
PaletteID pal = buf.ReadWord();