Merge branch 'save_ext' into improved_breakdowns

# Conflicts:
#	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2017-08-15 19:17:12 +01:00
69 changed files with 385 additions and 214 deletions

View File

@@ -183,7 +183,8 @@ static int ParseIntList(const char *p, int *items, int maxitems)
/* Do not accept multiple commas between numbers */
if (!comma) return -1;
comma = false;
/* FALL THROUGH */
FALLTHROUGH;
case ' ':
p++;
break;