cpp/openttd-patchpack/source Changeset - r25976:4cb7d4539ceb

Changeset - r25976:4cb7d4539ceb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

PeterN - 3 years ago 2021-09-19 20:52:08
peter1138@openttd.org

Fix #9562: Handle case of invalid action2 with zero results. (#9564)

1 file changed with 5 insertions and 0 deletions:

src/newgrf.cpp

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -5159,24 +5159,29 @@ static void NewSpriteGroup(ByteReader *b @@
+				{
 					byte num_loaded  = type;
 					byte num_loading = buf->ReadByte();
 					if (!_cur.HasValidSpriteSets(feature)) {
 						grfmsg(0, "NewSpriteGroup: No sprite set to work on! Skipping");
 						return;
+					}
 					grfmsg(6, "NewSpriteGroup: New SpriteGroup 0x%02X, %u loaded, %u loading",
 							setid, num_loaded, num_loading);
 					if (num_loaded + num_loading == 0) {
 						grfmsg(1, "NewSpriteGroup: no result, skipping invalid RealSpriteGroup");
 						break;
+					}
 					if (num_loaded + num_loading == 1) {
 						/* Avoid creating 'Real' sprite group if only one option. */
 						uint16 spriteid = buf->ReadWord();
 						act_group = CreateGroupFromGroupID(feature, setid, type, spriteid);
 						grfmsg(8, "NewSpriteGroup: one result, skipping RealSpriteGroup = subset %u", spriteid);
 						break;
+					}
 					std::vector<uint16> loaded;
 					std::vector<uint16> loading;
 					for (uint i = 0; i < num_loaded; i++) {

0 comments (0 inline, 0 general)