115
115
var /turfsSkipped = 0
116
116
#endif
117
117
118
- // text trimming (both directions) helper macro
119
- #define TRIM_TEXT (text ) (trim_reduced(text))
120
-
121
118
// / Shortcut function to parse a map and apply it to the world.
122
119
// /
123
120
// / - `dmm_file`: A .dmm file to load (Required).
@@ -722,7 +719,7 @@ GLOBAL_LIST_EMPTY(map_model_default)
722
719
if (member_string[length(member_string)] == " }" )
723
720
variables_start = findtext(member_string, " {" )
724
721
725
- var /path_text = TRIM_TEXT (copytext(member_string, 1 , variables_start))
722
+ var /path_text = trimtext (copytext(member_string, 1 , variables_start))
726
723
var /atom_def = text2path(path_text) // path definition, e.g /obj/foo/bar
727
724
728
725
if (! ispath(atom_def, / atom )) // Skip the item if the path does not exist. Fix your crap, mappers!
@@ -898,7 +895,7 @@ GLOBAL_LIST_EMPTY(map_model_default)
898
895
899
896
// check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7))
900
897
var /equal_position = findtext(text," =" ,old_position, position)
901
- var /trim_left = TRIM_TEXT (copytext(text,old_position,(equal_position ? equal_position : position)))
898
+ var /trim_left = trimtext (copytext(text,old_position,(equal_position ? equal_position : position)))
902
899
var /left_constant = parse_constant(trim_left)
903
900
if (position)
904
901
old_position = position + length(text[position])
@@ -908,7 +905,7 @@ GLOBAL_LIST_EMPTY(map_model_default)
908
905
if (equal_position && ! isnum(left_constant))
909
906
// Associative var, so do the association.
910
907
// Note that numbers cannot be keys - the RHS is dropped if so.
911
- var /trim_right = TRIM_TEXT (copytext(text, equal_position + length(text[equal_position]), position))
908
+ var /trim_right = trimtext (copytext(text, equal_position + length(text[equal_position]), position))
912
909
var /right_constant = parse_constant(trim_right)
913
910
. [left_constant] = right_constant
914
911
else // simple var
0 commit comments