From 7adb829d338da4412703df2a5c6383b1c363bde6 Mon Sep 17 00:00:00 2001 From: Remie Richards Date: Fri, 1 May 2015 16:36:05 +0100 Subject: [PATCH] Fixes the nature generator verb failing to recognise CLUSTER_CHECK_NONE as a valid flag --- code/modules/procedural mapping/mapGenerator.dm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/modules/procedural mapping/mapGenerator.dm b/code/modules/procedural mapping/mapGenerator.dm index 74bb3c8e692..887ddfc40a4 100644 --- a/code/modules/procedural mapping/mapGenerator.dm +++ b/code/modules/procedural mapping/mapGenerator.dm @@ -178,15 +178,21 @@ "Same turfs"=CLUSTER_CHECK_SAME_TURFS, "Same atoms"=CLUSTER_CHECK_SAME_ATOMS, "Different turfs"=CLUSTER_CHECK_DIFFERENT_TURFS, \ "Different atoms"=CLUSTER_CHECK_DIFFERENT_ATOMS, "All turfs"=CLUSTER_CHECK_ALL_TURFS,"All atoms"=CLUSTER_CHECK_ALL_ATOMS) - var/moduleClusters = input("Cluster Flags","Map Gen Settings") as null|anything in clusters + var/moduleClusters = input("Cluster Flags (Cancel to leave unchanged from defaults)","Map Gen Settings") as null|anything in clusters //null for default - - if(moduleClusters) + + var/theCluster = 0 + if(moduleClusters != "None") if(!clusters[moduleClusters]) src << "Invalid Cluster Flags" return + theCluster = clusters[moduleClusters] + else + theCluster = CLUSTER_CHECK_NONE + + if(theCluster) for(var/datum/mapGeneratorModule/M in N.modules) - M.clusterCheckFlags = clusters[moduleClusters] + M.clusterCheckFlags = theCluster src << "Defining Region"