From 465368ce3e22ea00cf56d1cbbd912e7bba5f7bb9 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 30 Dec 2018 08:48:15 -0500 Subject: [PATCH] merge 2 --- src/options.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/options.c b/src/options.c index def9a4d4e..301b0b3b2 100644 --- a/src/options.c +++ b/src/options.c @@ -5196,7 +5196,7 @@ boolean setinitial, setfromfile; int res, which_set, setcount = 0, chosen = -2; which_set = rogueflag ? ROGUESET : PRIMARY; - symset_list = (struct symsetentry *) 0; + g.symset_list = (struct symsetentry *) 0; /* clear symset[].name as a flag to read_sym_file() to build list */ symset_name = g.symset[which_set].name; g.symset[which_set].name = (char *) 0; @@ -5257,7 +5257,7 @@ boolean setinitial, setfromfile; if (chosen > -1) { /* chose an actual symset name from file */ - for (sl = symset_list; sl; sl = sl->next) + for (sl = g.symset_list; sl; sl = sl->next) if (sl->idx == chosen) break; if (sl) {