Merge pull request #8737 from Spookerton/spkrtn/fix/type2parent-correction

fix || in type2parent switch, gentle refactor
This commit is contained in:
Atermonera
2022-10-13 17:58:34 -08:00
committed by GitHub

View File

@@ -349,21 +349,22 @@
last_found = found + delim_len
while (found)
/proc/type2parent(child)
var/string_type = "[child]"
var/last_slash = findlasttext(string_type, "/")
if(last_slash == 1)
switch(child)
if(/datum)
return null
if(/obj || /mob)
return /atom/movable
if(/area || /turf)
return /atom
else
return /datum
if (last_slash != 1)
return text2path(copytext(string_type, 1, last_slash))
switch (child)
if (/datum)
return null
if (/obj, /mob)
return /atom/movable
if (/area, /turf)
return /atom
else
return /datum
return text2path(copytext(string_type, 1, last_slash))
//checks if a file exists and contains text
//returns text as a string if these conditions are met