Merge pull request scp-fs2open#6852 from MjnMixael/fix_rocket_ani_assertion

JohnAFernandez · web-flow · commit 1d5fa5eef15c · 2025-07-22T21:15:35.000-04:00
Remove rocket ani assertion
diff --git a/code/scpui/RocketRenderingInterface.cpp b/code/scpui/RocketRenderingInterface.cpp
@@ -335,7 +335,9 @@ int RocketRenderingInterface::getBitmapNum(Rocket::Core::TextureHandle handle)
 void RocketRenderingInterface::advanceAnimation(Rocket::Core::TextureHandle handle, float advanceTime)
 {
 	Assertion(handle != 0, "Invalid handle for setAnimationFrame");
-	Assertion(get_texture(handle)->is_animation, "Tried to use advanceAnimation with a non-animation!");
+	if (!get_texture(handle)->is_animation) {
+		return;
+	}
 
 	auto tex = get_texture(handle);
 

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,9 @@ int RocketRenderingInterface::getBitmapNum(Rocket::Core::TextureHandle handle)`
`335`	`335`	`void RocketRenderingInterface::advanceAnimation(Rocket::Core::TextureHandle handle, float advanceTime)`
`336`	`336`	`{`
`337`	`337`	`Assertion(handle != 0, "Invalid handle for setAnimationFrame");`
`338`		`- Assertion(get_texture(handle)->is_animation, "Tried to use advanceAnimation with a non-animation!");`
	`338`	`+ if (!get_texture(handle)->is_animation) {`
	`339`	`+ return;`
	`340`	`+ }`
`339`	`341`
`340`	`342`	`auto tex = get_texture(handle);`
`341`	`343`