Fixed crash when trying to load game with actors that have waypoints if there's no scene

garethyr · garethyr · commit 89fd2e5d8f14 · 2023-06-18T18:45:34.000-03:00
diff --git a/Entities/Actor.cpp b/Entities/Actor.cpp
@@ -1221,6 +1221,10 @@ MOID Actor::GetAIMOWaypointID() const
 
 bool Actor::UpdateMovePath()
 {
+
+	if (g_SceneMan.GetScene() == nullptr) {
+		return false;
+	}
     // TODO: Do throttling of calls for this function over time??
 
     // Estimate how much material this actor can dig through

Original file line number	Diff line number	Diff line change
`@@ -1221,6 +1221,10 @@ MOID Actor::GetAIMOWaypointID() const`
`1221`	`1221`
`1222`	`1222`	`bool Actor::UpdateMovePath()`
`1223`	`1223`	`{`
	`1224`	`+`
	`1225`	`+ if (g_SceneMan.GetScene() == nullptr) {`
	`1226`	`+ return false;`
	`1227`	`+ }`
`1224`	`1228`	`// TODO: Do throttling of calls for this function over time??`
`1225`	`1229`
`1226`	`1230`	`// Estimate how much material this actor can dig through`