# HG changeset patch
# User michi_cc <michi_cc@openttd.org>
# Date 1328362128 0
# Node ID fec98a4a1acb14f69a5525cce785aef84d576014
# Parent  d94c45de416a0b966cb166118fe467fba5931a93
(svn r23883) -Fix: [NewGRF] It wasn't possible to import sounds from a NewGRF later in the load order.

diff --git a/src/newgrf.cpp b/src/newgrf.cpp
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -6882,15 +6882,20 @@
 		byte action = FioReadByte();
 		switch (action) {
 			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.
 				break;
 
 			case 0xFE:
-				/* XXX 'Action 0xFE' isn't really specified. It is only mentioned for
-				 * importing sounds, so this is probably all wrong... */
-				if (FioReadByte() != 0) grfmsg(1, "GRFSound: Import type mismatch");
-				ImportGRFSound();
+				if (_cur.stage == GLS_ACTIVATION) {
+					/* XXX 'Action 0xFE' isn't really specified. It is only mentioned for
+					 * importing sounds, so this is probably all wrong... */
+					if (FioReadByte() != 0) grfmsg(1, "GRFSound: Import type mismatch");
+					ImportGRFSound();
+				} else {
+					FioSkipBytes(len - 1);
+				}
 				break;
 
 			default:
@@ -8508,7 +8513,7 @@
 		/* 0x0E */ { NULL,     SafeGRFInhibit, NULL,       GRFInhibit,     GRFInhibit,        GRFInhibit, },
 		/* 0x0F */ { NULL,     GRFUnsafe, NULL,            FeatureTownName, 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, },
 		/* 0x13 */ { NULL,     NULL,      NULL,            NULL,           NULL,              TranslateGRFStrings, },
 		/* 0x14 */ { StaticGRFInfo, NULL, NULL,            NULL,           NULL,              NULL, },