Merge pull request #4477 from notimaginative/fix_fireball_lod_assertion

Goober5000 · web-flow · commit bb6d7515df33 · 2022-07-08T18:56:26.000-04:00
fix lod assertion check (it can equal the max)
diff --git a/code/fireball/fireballs.cpp b/code/fireball/fireballs.cpp
@@ -407,7 +407,7 @@ void fireball_parse_tbl()
 	{
 		if (fi.lod_count > 1)
 		{
-			Assertion(fi.lod_count < MAX_FIREBALL_LOD, "Fireball LOD (%d) greater than MAX_FIREBALL_LOD %d.", fi.lod_count, MAX_FIREBALL_LOD);
+			Assertion(fi.lod_count <= MAX_FIREBALL_LOD, "Fireball LOD (%d) greater than MAX_FIREBALL_LOD %d.", fi.lod_count, MAX_FIREBALL_LOD);
 			static_assert(MAX_FIREBALL_LOD < 10, "The fireball LOD naming scheme needs to be changed for LODs > 9");
 
 			auto lod0 = fi.lod[0].filename;

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ void fireball_parse_tbl()`
`407`	`407`	`{`
`408`	`408`	`if (fi.lod_count > 1)`
`409`	`409`	`{`
`410`		`- Assertion(fi.lod_count < MAX_FIREBALL_LOD, "Fireball LOD (%d) greater than MAX_FIREBALL_LOD %d.", fi.lod_count, MAX_FIREBALL_LOD);`
	`410`	`+ Assertion(fi.lod_count <= MAX_FIREBALL_LOD, "Fireball LOD (%d) greater than MAX_FIREBALL_LOD %d.", fi.lod_count, MAX_FIREBALL_LOD);`
`411`	`411`	`static_assert(MAX_FIREBALL_LOD < 10, "The fireball LOD naming scheme needs to be changed for LODs > 9");`
`412`	`412`
`413`	`413`	`auto lod0 = fi.lod[0].filename;`