From f1f1098d956d806da4d197bc8f6715583a024cdf Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 29 Jun 2018 12:16:35 +0200
Subject: [PATCH] removed some remaining references to sval, fixed the
 compilation of RogueViz

---
 conformal.cpp        | 1 -
 game.cpp             | 2 --
 mapeditor.cpp        | 2 +-
 rogueviz-kohonen.cpp | 7 +++----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/conformal.cpp b/conformal.cpp
index 0978b93c..b56fa122 100644
--- a/conformal.cpp
+++ b/conformal.cpp
@@ -831,7 +831,6 @@ namespace conformal {
     infindhistory.clear();
     for(int i=0; i<isize(movehistory); i++)
       inmovehistory.insert(movehistory[i]);
-    sval++;
     int sk = isize(killhistory);
     for(int i=0; i<sk; i++) {
       eMonster m = killhistory[i].second;
diff --git a/game.cpp b/game.cpp
index fb2b980c..731a0911 100644
--- a/game.cpp
+++ b/game.cpp
@@ -18,8 +18,6 @@ cell *lastmove;
 enum eLastmovetype {lmSkip, lmMove, lmAttack, lmSpecial, lmPush, lmTree};
 eLastmovetype lastmovetype;
 
-int sval = 100000000;
-
 bool hauntedWarning;
 bool survivalist;
 
diff --git a/mapeditor.cpp b/mapeditor.cpp
index 729c9701..b406c15d 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -622,7 +622,7 @@ namespace mapeditor {
   vector<pair<cellwalker, cellwalker> > spill_list;
   
   void list_spill(cellwalker tgt, cellwalker src, manual_celllister& cl) {
-    spill_list.clear(); sval++;
+    spill_list.clear(); 
     spill_list.emplace_back(tgt, src);
     int crad = 0, nextstepat = 0;
     for(int i=0; i<isize(spill_list); i++) {
diff --git a/rogueviz-kohonen.cpp b/rogueviz-kohonen.cpp
index 0329dde8..0a2eefb1 100644
--- a/rogueviz-kohonen.cpp
+++ b/rogueviz-kohonen.cpp
@@ -288,21 +288,20 @@ struct cellcrawler {
   vector<cellcrawlerdata> data;
   
   void store(const cellwalker& o, int from, int spin, manual_celllister& cl) {
-    if(!add(o.c)) return;
+    if(!cl.add(o.c)) return;
     data.emplace_back(o, from, spin);
     }
   
   void build(const cellwalker& start) {
-    sval++;
     data.clear();
     manual_celllister cl;
-    store(start, 0, 0);
+    store(start, 0, 0, cl);
     for(int i=0; i<isize(data); i++) {
       cellwalker cw0 = data[i].orig;
       for(int j=0; j<cw0.c->type; j++) {
         cellwalker cw = cw0 + j + wstep;
         if(!getNeuron(cw.c)) continue;
-        store(cw, i, j);
+        store(cw, i, j, cl);
         }
       }
     if(gaussian) for(cellcrawlerdata& s: data)