Merge branch 'master' into jgrpp

# Conflicts: # src/saveload/afterload.cpp
2021-11-20 13:15:32 +00:00
parent 5723c317f7 ad90e88ebd
commit 0691b25e17
14 changed files with 35 additions and 23 deletions
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -3117,7 +3117,7 @@ static ChangeInfoResult CargoChangeInfo(uint cid, int numinfo, int prop, const G
 			}

 			case 0x19: // Town growth coefficient
-				cs->multipliertowngrowth = buf->ReadWord();
+				buf->ReadWord();
 				break;

 			case 0x1A: // Bitmask of callbacks to use