diff --git a/Shuffle.cs b/Shuffle.cs index 29543dbfe..959964afc 100644 --- a/Shuffle.cs +++ b/Shuffle.cs @@ -542,6 +542,9 @@ private void PrepareRulesetItemData() { string[] data = ReadRulesetFromResources(); + ItemList = new List(); + + // no logic if (data == null) { for (var i = 0; i < Items.TotalNumberOfItems; i++) @@ -555,8 +558,11 @@ private void PrepareRulesetItemData() ItemList.Add(currentItem); } } + else + { + PopulateItemList(data); + } - PopulateItemList(data); AddRequirementsForSongOath(); } @@ -569,8 +575,6 @@ private void AddRequirementsForSongOath() private void PopulateItemList(string[] data) { - ItemList = new List(); - int itemId = 0; int lineNumber = 0; diff --git a/fMain.cs b/fMain.cs index 825baf4ca..cd5d4cf88 100644 --- a/fMain.cs +++ b/fMain.cs @@ -810,6 +810,7 @@ private void EnableAllControls(bool v) cCutsc.Enabled = v; cDChests.Enabled = v; cDEnt.Enabled = v; + cMode.Enabled = v; cDMult.Enabled = v; cDType.Enabled = v; cDummy.Enabled = v; @@ -825,6 +826,7 @@ private void EnableAllControls(bool v) cVC.Enabled = v; cQText.Enabled = v; cSpoiler.Enabled = v; + cTatl.Enabled = v; bopen.Enabled = v; bRandomise.Enabled = v;