|
115 | 115 | #undef MessageBox |
116 | 116 | #endif |
117 | 117 |
|
118 | | - |
119 | | - |
120 | | -#define TRUE 1 |
121 | | -#define FALSE 0 |
| 118 | +// these are useful for embedding numbers in SEXP help strings |
| 119 | +// see https://stackoverflow.com/questions/5459868/concatenate-int-to-string-using-c-preprocessor |
| 120 | +#define STR_HELPER(x) #x |
| 121 | +#define STR(x) STR_HELPER(x) |
122 | 122 |
|
123 | 123 |
|
124 | 124 | SCP_vector<sexp_oper> Operators = { |
@@ -2825,7 +2825,7 @@ int check_sexp_syntax(int node, int return_type, int recursive, int *bad_node, i |
2825 | 2825 | if (*CTEXT(node) != '#') { // not a manual source? |
2826 | 2826 | if ( stricmp(CTEXT(node), "<any wingman>") != 0) |
2827 | 2827 | if ( stricmp(CTEXT(node), "<none>") != 0 ) // not a special token? |
2828 | | - if ((ship_name_lookup(CTEXT(node), TRUE) < 0) && (wing_name_lookup(CTEXT(node), 1) < 0)) // is it in the mission? |
| 2828 | + if ((ship_name_lookup(CTEXT(node), 1) < 0) && (wing_name_lookup(CTEXT(node), 1) < 0)) // is it in the mission? |
2829 | 2829 | if (Fred_running || !mission_check_ship_yet_to_arrive(CTEXT(node))) |
2830 | 2830 | return SEXP_CHECK_INVALID_MSG_SOURCE; |
2831 | 2831 | } |
@@ -33166,7 +33166,7 @@ SCP_vector<sexp_help_struct> Sexp_help = { |
33166 | 33166 | // Goober5000 |
33167 | 33167 | { OP_AI_IGNORE_NEW, "Ai-ignore-new (Ship goal)\r\n" |
33168 | 33168 | "\tTells the specified ship to ignore the given target and not consider it when picking something " |
33169 | | - "to attack. Up to MAX_IGNORE_NEW_OBJECTS targets can be ignored at a time. Targets ignored by " |
| 33169 | + "to attack. Up to " STR(MAX_IGNORE_NEW_OBJECTS) " targets can be ignored at a time. Targets ignored by " |
33170 | 33170 | "any given ship do not affect targets ignored by any other ship.\r\n\r\n" |
33171 | 33171 | "Takes 2 arguments...\r\n" |
33172 | 33172 | "\t1:\tName of target to ignore.\r\n" |
|
0 commit comments