Merge pull request #4498 from Baezon/clear-goals-fix

Goober5000 · web-flow · commit ddef6ea37790 · 2022-07-19T09:57:48.000-04:00
Bugfix for not present ships in `clear-goals`
diff --git a/code/parse/sexp.cpp b/code/parse/sexp.cpp
@@ -11846,7 +11846,7 @@ void sexp_clear_goals(int n)
 		if (ship_entry)
 		{
 			if (ship_entry->status != ShipStatus::PRESENT)
-				return;										// ship not around anymore???? then forget it!
+				continue;										// ship not around anymore???? then forget it!
 
 			ai_clear_ship_goals(&(Ai_info[ship_entry->shipp->ai_index]));
 			continue;
@@ -11856,7 +11856,7 @@ void sexp_clear_goals(int n)
 		if (wingp)
 		{
 			if (wingp->flags[Ship::Wing_Flags::Gone])
-				return;										// wing not around anymore???? then forget it!
+				continue;										// wing not around anymore???? then forget it!
 
 			ai_clear_wing_goals(wingp);
 		}

Original file line number	Diff line number	Diff line change
`@@ -11846,7 +11846,7 @@ void sexp_clear_goals(int n)`
`11846`	`11846`	`if (ship_entry)`
`11847`	`11847`	`{`
`11848`	`11848`	`if (ship_entry->status != ShipStatus::PRESENT)`
`11849`		`- return; // ship not around anymore???? then forget it!`
	`11849`	`+ continue; // ship not around anymore???? then forget it!`
`11850`	`11850`
`11851`	`11851`	`ai_clear_ship_goals(&(Ai_info[ship_entry->shipp->ai_index]));`
`11852`	`11852`	`continue;`
`@@ -11856,7 +11856,7 @@ void sexp_clear_goals(int n)`
`11856`	`11856`	`if (wingp)`
`11857`	`11857`	`{`
`11858`	`11858`	`if (wingp->flags[Ship::Wing_Flags::Gone])`
`11859`		`- return; // wing not around anymore???? then forget it!`
	`11859`	`+ continue; // wing not around anymore???? then forget it!`
`11860`	`11860`
`11861`	`11861`	`ai_clear_wing_goals(wingp);`
`11862`	`11862`	`}`