Merge pull request #1404 from Goober5000/debug_sexp_tweak

minor enhancements to the debug sexp

Author: The-E

code/parse/sexp.cpp

@@ -20437,34 +20437,37 @@ void sexp_string_set_substring(int node)
 void sexp_debug(int node)
 {
 	int i;
-	char *id;
-	char temp_buf[MESSAGE_LENGTH] = {""};
+	SCP_string warning_message;
 
 	#ifdef NDEBUG
 	int no_release_message;
 	no_release_message = is_sexp_true(node); 
 	#endif
 
 	node = CDR(node); 
-	Assertion (node >= 0, "No message defined in debug SEXP"); 
-	id = CTEXT(node);
+	Assertion (node >= 0, "No message defined in debug SEXP");
 
+	// we'll suppose it's the string for now
+	warning_message = CTEXT(node);
+
+	// but use an actual message if one exists
 	for (i=0; i<Num_messages; i++) {
 		// find the message
-		if ( !stricmp(id, Messages[i].name) ) {
-			//replace variables if necessary
-			strcpy_s(temp_buf, Messages[i].message);
-			sexp_replace_variable_names_with_values(temp_buf, MESSAGE_LENGTH); 
+		if ( !stricmp(Messages[i].name, warning_message.c_str()) ) {
+			warning_message = Messages[i].message;
 			break;
 		}
 	}
 
+	// replace variables if necessary
+	sexp_replace_variable_names_with_values(warning_message);
+
 	//send the message
 	#ifndef NDEBUG
-		Warning(LOCATION, "%s", temp_buf);
+		Warning(LOCATION, "%s", warning_message.c_str());
     #else	
 	if (!no_release_message) {	
-		ReleaseWarning(LOCATION, "%s", temp_buf);
+		ReleaseWarning(LOCATION, "%s", warning_message.c_str());
 	}
 	#endif
 }
@@ -26184,10 +26187,8 @@ int query_operator_argument_type(int op, int argnum)
 		case OP_DEBUG:
 			if (argnum == 0) {
 				return OPF_BOOL;
-			}else if (argnum == 1) {
-				return OPF_MESSAGE; 
-			}else  {
-				return OPF_STRING;
+			} else {
+				return OPF_MESSAGE_OR_STRING;
 			}
 
 		case OP_HAS_TIME_ELAPSED:
@@ -31662,8 +31663,8 @@ sexp_help_struct Sexp_help[] = {
 	{ OP_DEBUG, "debug\r\n"
 		"\tPops up a warning on debug builds (and optionally on release builds)\r\n"
 		"Takes 1 or more arguments...\r\n"
-		"\t1:\t If false, popup messages in release builds too. Defaults to true.\r\n"
-		"\t2:\tName of a message which will appear in the warning (optional)\r\n"},
+		"\t1:\tLimit warning to debug builds.  If false, display warning in release builds too. Defaults to true.\r\n"
+		"\t2:\tA short string which will appear in the warning, or a message if the string matches a message name.\r\n"},
 
 	{ OP_GRANT_PROMOTION, "Grant promotion (Action operator)\r\n"
 		"\tIn a single player game, this function grants a player an automatic promotion to the "
@@ -31732,7 +31733,7 @@ sexp_help_struct Sexp_help[] = {
 		"have scanned each one.\r\n\r\n"
 		"Returns a boolean value after <delay> seconds when all cargo is known.  Takes 2 or more arguments...\r\n"
 		"\t1:\tDelay in seconds after which sexpression will return true when all cargo scanned."
-		"\tRest:\tNames of ships/cargo to check for cargo known.." },
+		"\tRest:\tNames of ships/cargo to check for cargo known." },
 
 	{ OP_WAS_PROMOTION_GRANTED, "Was promotion granted (Boolean operator)\r\n"
 		"\tReturns true if a promotion was granted via the 'Grant promotion' operator in the mission.\r\n\r\n"