Merge pull request #4440 from Goober5000/fix_message_source_error

Goober5000 · web-flow · commit ed8af9d19711 · 2022-06-25T16:44:23.000-04:00
better handling of invalid message sources
diff --git a/code/parse/sexp.cpp b/code/parse/sexp.cpp
@@ -13353,7 +13353,8 @@ void sexp_send_one_message( const char *name, const char *who_from, const char *
 	} else if ( !stricmp(who_from, "<none>") ) {
 		source = MESSAGE_SOURCE_NONE;
 	} else {
-		Assertion(false, "Curious... all message sources should have been covered");
+		Warning(LOCATION, "Invalid message source '%s'.  Unable to send message.", who_from);
+		return;
 	}
 
 	if ( ship_index == -1 ){

Original file line number	Diff line number	Diff line change
`@@ -13353,7 +13353,8 @@ void sexp_send_one_message( const char name, const char who_from, const char *`
`13353`	`13353`	`} else if ( !stricmp(who_from, "<none>") ) {`
`13354`	`13354`	`source = MESSAGE_SOURCE_NONE;`
`13355`	`13355`	`} else {`
`13356`		`- Assertion(false, "Curious... all message sources should have been covered");`
	`13356`	`+ Warning(LOCATION, "Invalid message source '%s'. Unable to send message.", who_from);`
	`13357`	`+ return;`
`13357`	`13358`	`}`
`13358`	`13359`
`13359`	`13360`	`if ( ship_index == -1 ){`