Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23883) -Fix: [NewGRF] It wasn't possible to import sounds from a NewGRF later in the load order.

Browse Source
This commit is contained in:
michi_cc 2012-02-04 13:28:48 +00:00
parent 12f0e80dad
commit b4846423ac
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/newgrf.cpp
View File

@ -6882,15 +6882,20 @@ static void GRFSound(ByteReader *buf)
byte action = FioReadByte(); byte action = FioReadByte();
switch (action) { switch (action) {
case 0xFF: case 0xFF:
LoadGRFSound(offs); /* Allocate sound only in init stage. */
if (_cur.stage == GLS_INIT) LoadGRFSound(offs);
FioSkipBytes(len - 1); // <type> is not included in the length for pseudo-sprites. FioSkipBytes(len - 1); // <type> is not included in the length for pseudo-sprites.
break; break;
case 0xFE: case 0xFE:
/* XXX 'Action 0xFE' isn't really specified. It is only mentioned for if (_cur.stage == GLS_ACTIVATION) {
* importing sounds, so this is probably all wrong... */ /* XXX 'Action 0xFE' isn't really specified. It is only mentioned for
if (FioReadByte() != 0) grfmsg(1, "GRFSound: Import type mismatch"); * importing sounds, so this is probably all wrong... */
ImportGRFSound(); if (FioReadByte() != 0) grfmsg(1, "GRFSound: Import type mismatch");
ImportGRFSound();
} else {
FioSkipBytes(len - 1);
}
break; break;
default: default:
@ -8508,7 +8513,7 @@ static void DecodeSpecialSprite(byte *buf, uint num, GrfLoadingStage stage)
/* 0x0E */ { NULL, SafeGRFInhibit, NULL, GRFInhibit, GRFInhibit, GRFInhibit, }, /* 0x0E */ { NULL, SafeGRFInhibit, NULL, GRFInhibit, GRFInhibit, GRFInhibit, },
/* 0x0F */ { NULL, GRFUnsafe, NULL, FeatureTownName, NULL, NULL, }, /* 0x0F */ { NULL, GRFUnsafe, NULL, FeatureTownName, NULL, NULL, },
/* 0x10 */ { NULL, NULL, DefineGotoLabel, NULL, NULL, NULL, }, /* 0x10 */ { NULL, NULL, DefineGotoLabel, NULL, NULL, NULL, },
/* 0x11 */ { SkipAct11,GRFUnsafe, SkipAct11, SkipAct11, SkipAct11, GRFSound, }, /* 0x11 */ { SkipAct11,GRFUnsafe, SkipAct11, GRFSound, SkipAct11, GRFSound, },
/* 0x12 */ { SkipAct12, SkipAct12, SkipAct12, SkipAct12, SkipAct12, LoadFontGlyph, }, /* 0x12 */ { SkipAct12, SkipAct12, SkipAct12, SkipAct12, SkipAct12, LoadFontGlyph, },
/* 0x13 */ { NULL, NULL, NULL, NULL, NULL, TranslateGRFStrings, }, /* 0x13 */ { NULL, NULL, NULL, NULL, NULL, TranslateGRFStrings, },
/* 0x14 */ { StaticGRFInfo, NULL, NULL, NULL, NULL, NULL, }, /* 0x14 */ { StaticGRFInfo, NULL, NULL, NULL, NULL, NULL, },