mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
Merge pull request #10538 from GinjaNinja32/debug
Debug code to try to figure out the cause of the player-panel etc breaking
This commit is contained in:
@@ -211,14 +211,23 @@ proc/listclearnulls(list/list)
|
|||||||
return (result + R.Copy(Ri, 0))
|
return (result + R.Copy(Ri, 0))
|
||||||
|
|
||||||
//Mergesort: divides up the list into halves to begin the sort
|
//Mergesort: divides up the list into halves to begin the sort
|
||||||
/proc/sortAtom(var/list/atom/L, var/order = 1)
|
/proc/sortAtom(var/list/atom/L, var/order = 1, first = 1)
|
||||||
if(isnull(L) || L.len < 2)
|
if(isnull(L) || L.len < 2)
|
||||||
|
if(!L)
|
||||||
|
testing("sortAtom() called with null as first parameter!")
|
||||||
return L
|
return L
|
||||||
|
if(first)
|
||||||
|
var/msg = "sortAtom() called with list([L.len]): "
|
||||||
|
for(var/x in L)
|
||||||
|
msg += "'[x]'; "
|
||||||
|
testing(msg)
|
||||||
var/middle = L.len / 2 + 1
|
var/middle = L.len / 2 + 1
|
||||||
return mergeAtoms(sortAtom(L.Copy(0,middle)), sortAtom(L.Copy(middle)), order)
|
return mergeAtoms(sortAtom(L.Copy(0,middle), order, 0), sortAtom(L.Copy(middle), order, 0), order)
|
||||||
|
|
||||||
//Mergsort: does the actual sorting and returns the results back to sortAtom
|
//Mergsort: does the actual sorting and returns the results back to sortAtom
|
||||||
/proc/mergeAtoms(var/list/atom/L, var/list/atom/R, var/order = 1)
|
/proc/mergeAtoms(var/list/atom/L, var/list/atom/R, var/order = 1)
|
||||||
|
if(!L || !R)
|
||||||
|
testing("mergeAtoms([L] ([L ? L.len : "*null*"]), [R] ([R ? R.len : "*null*"]))")
|
||||||
var/Li=1
|
var/Li=1
|
||||||
var/Ri=1
|
var/Ri=1
|
||||||
var/list/result = new()
|
var/list/result = new()
|
||||||
@@ -231,8 +240,14 @@ proc/listclearnulls(list/list)
|
|||||||
result += R[Ri++]
|
result += R[Ri++]
|
||||||
|
|
||||||
if(Li <= L.len)
|
if(Li <= L.len)
|
||||||
return (result + L.Copy(Li, 0))
|
. = (result + L.Copy(Li, 0))
|
||||||
return (result + R.Copy(Ri, 0))
|
if(!.)
|
||||||
|
testing("mergeAtoms returning [.]")
|
||||||
|
return
|
||||||
|
. = (result + R.Copy(Ri, 0))
|
||||||
|
if(!.)
|
||||||
|
testing("mergeAtoms returning [.]")
|
||||||
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user