Merge pull request #1349 from MageKing17/bugfix/avoid-rank-int3

asarium · web-flow · commit c03dbea7ead7 · 2017-05-18T09:11:12.000+02:00
Avoid Int3() when finding a rank with an out-of-order points value.
diff --git a/code/stats/scoring.cpp b/code/stats/scoring.cpp
@@ -105,12 +105,10 @@ void parse_rank_tbl()
 		required_string("#End");
 
 		// be sure that all rank points are in order
-#ifndef NDEBUG
 		for (idx = 0; idx < NUM_RANKS - 1; idx++) {
 			if (Ranks[idx].points >= Ranks[idx + 1].points)
-				Int3();
+				Warning(LOCATION, "Rank #%d (%s) has a higher \"$Points:\" value (%d) than the following rank (%s, %d points). This shouldn't actually crash FSO, but it might result in unexpected or incorrect behavior.\n", idx + 1, Ranks[idx].name, Ranks[idx].points, Ranks[idx+1].name, Ranks[idx+1].points);
 		}
-#endif
 	}
 	catch (const parse::ParseException& e)
 	{

Original file line number	Diff line number	Diff line change
`@@ -105,12 +105,10 @@ void parse_rank_tbl()`
`105`	`105`	`required_string("#End");`
`106`	`106`
`107`	`107`	`// be sure that all rank points are in order`
`108`		`-#ifndef NDEBUG`
`109`	`108`	`for (idx = 0; idx < NUM_RANKS - 1; idx++) {`
`110`	`109`	`if (Ranks[idx].points >= Ranks[idx + 1].points)`
`111`		`- Int3();`
	`110`	`+ Warning(LOCATION, "Rank #%d (%s) has a higher \"$Points:\" value (%d) than the following rank (%s, %d points). This shouldn't actually crash FSO, but it might result in unexpected or incorrect behavior.\n", idx + 1, Ranks[idx].name, Ranks[idx].points, Ranks[idx+1].name, Ranks[idx+1].points);`
`112`	`111`	`}`
`113`		`-#endif`
`114`	`112`	`}`
`115`	`113`	`catch (const parse::ParseException& e)`
`116`	`114`	`{`