(svn r14184) -Codechange: [NewGRF] Since our NewGRF handling is better than it used to be, disable a NewGRF if unexpected sprites are reached.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 2fc15c06a..35c604bb6 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -5918,7 +5918,14 @@ void LoadNewGRFFile(GRFConfig *config, uint file_index, GrfLoadingStage stage)
 				FioSkipBytes(num);
 			}
 		} else {
-			if (_skip_sprites == 0) grfmsg(7, "LoadNewGRFFile: Skipping unexpected sprite");
+			if (_skip_sprites == 0) {
+				grfmsg(0, "LoadNewGRFFile: Unexpected sprite, disabling");
+				config->status = GCS_DISABLED;
+				config->error  = CallocT<GRFError>(1);
+				config->error->severity = STR_NEWGRF_ERROR_MSG_FATAL;
+				config->error->message  = STR_NEWGRF_ERROR_UNEXPECTED_SPRITE;
+				break;
+			}
 
 			FioSkipBytes(7);
 			num -= 8;