Merge pull request #2283 from YotaXP/list2text-refactor

Optimized and refactored list2text, text2list, and replacetext.
This commit is contained in:
Giacom
2014-01-11 10:11:13 -08:00
17 changed files with 146 additions and 142 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
/datum/admins/proc/create_mob(var/mob/user)
if (!create_mob_html)
var/mobjs = null
mobjs = dd_list2text(typesof(/mob), ";")
mobjs = list2text(typesof(/mob), ";")
create_mob_html = file2text('html/create_object.html')
create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
+2 -2
View File
@@ -3,7 +3,7 @@
/datum/admins/proc/create_object(var/mob/user)
if (!create_object_html)
var/objectjs = null
objectjs = dd_list2text(typesof(/obj), ";")
objectjs = list2text(typesof(/obj), ";")
create_object_html = file2text('html/create_object.html')
create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
@@ -21,7 +21,7 @@
if (!quick_create_object_html)
var/objectjs = null
objectjs = dd_list2text(typesof(path), ";")
objectjs = list2text(typesof(path), ";")
quick_create_object_html = file2text('html/create_object.html')
quick_create_object_html = replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"")
+1 -1
View File
@@ -2,7 +2,7 @@
/datum/admins/proc/create_turf(var/mob/user)
if (!create_turf_html)
var/turfjs = null
turfjs = dd_list2text(typesof(/turf), ";")
turfjs = list2text(typesof(/turf), ";")
create_turf_html = file2text('html/create_object.html')
create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")
+1 -1
View File
@@ -1471,7 +1471,7 @@
alert("Select fewer object types, (max 5)")
return
else if(length(removed_paths))
alert("Removed:\n" + dd_list2text(removed_paths, "\n"))
alert("Removed:\n" + list2text(removed_paths, "\n"))
var/list/offset = text2list(href_list["offset"],",")
var/number = dd_range(1, 100, text2num(href_list["object_count"]))
+7 -7
View File
@@ -1066,16 +1066,16 @@ var/global/list/g_fancy_list_of_safe_types = null
switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs","Clients","Joined Clients"))
if("Players")
usr << dd_list2text(player_list,",")
usr << list2text(player_list,",")
if("Admins")
usr << dd_list2text(admins,",")
usr << list2text(admins,",")
if("Mobs")
usr << dd_list2text(mob_list,",")
usr << list2text(mob_list,",")
if("Living Mobs")
usr << dd_list2text(living_mob_list,",")
usr << list2text(living_mob_list,",")
if("Dead Mobs")
usr << dd_list2text(dead_mob_list,",")
usr << list2text(dead_mob_list,",")
if("Clients")
usr << dd_list2text(clients,",")
usr << list2text(clients,",")
if("Joined Clients")
usr << dd_list2text(joined_player_list,",")
usr << list2text(joined_player_list,",")
+1 -1
View File
@@ -211,7 +211,7 @@
if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
temp_message[H] = ninjaspeak(temp_message[H])
pick_list -= H
message = dd_list2text(temp_message, " ")
message = list2text(temp_message, " ")
message = replacetext(message, "o", "¤")
message = replacetext(message, "p", "þ")
message = replacetext(message, "l", "£")
+1 -1
View File
@@ -24,7 +24,7 @@
var/obj/item/weapon/paper/P = new(get_turf(src))
P.name = "paper- 'Scanner Report'"
P.info = "<center><font size='6'><B>Scanner Report</B></font></center><HR><BR>"
P.info += dd_list2text(log, "<BR>")
P.info += list2text(log, "<BR>")
P.info += "<HR><B>Notes:</B><BR>"
P.info_links = P.info
+2 -2
View File
@@ -57,7 +57,7 @@ proc/NewStutter(phrase,stunned)
split_phrase[index] = word
return sanitize(dd_list2text(split_phrase," "))
return sanitize(list2text(split_phrase," "))
proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness.
step(M, pick(d,turn(d,90),turn(d,-90)))
@@ -79,6 +79,6 @@ proc/Ellipsis(original_msg, chance = 50, keep_words)
continue
new_words += w
new_msg = dd_list2text(new_words," ")
new_msg = list2text(new_words," ")
return new_msg
+1 -1
View File
@@ -52,7 +52,7 @@
if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
temp_message[H] = "HONK"
pick_list -= H //Make sure that you dont HONK the same word twice
message = dd_list2text(temp_message, " ")
message = list2text(temp_message, " ")
if(wear_mask)
message = wear_mask.speechModification(message)
+1 -1
View File
@@ -87,7 +87,7 @@ var/const/VOX_DELAY = 600
src << "<span class='notice'>Wireless interface disabled, unable to interact with announcement PA.</span>"
return
var/list/words = stringsplit(trim(message), " ")
var/list/words = text2list(trim(message), " ")
var/list/incorrect_words = list()
if(words.len > 30)