mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-02 12:19:18 +00:00
Code Issues Releases Wiki Activity

removed some remaining references to sval, fixed the compilation of RogueViz

Browse Source
This commit is contained in:
Zeno Rogue 2018-06-29 12:16:35 +02:00
parent 313dd233a2
commit f1f1098d95
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conformal.cpp
View File

@ -831,7 +831,6 @@ namespace conformal {
infindhistory.clear(); infindhistory.clear();
for(int i=0; i<isize(movehistory); i++) for(int i=0; i<isize(movehistory); i++)
inmovehistory.insert(movehistory[i]); inmovehistory.insert(movehistory[i]);
sval++;
int sk = isize(killhistory); int sk = isize(killhistory);
for(int i=0; i<sk; i++) { for(int i=0; i<sk; i++) {
eMonster m = killhistory[i].second; eMonster m = killhistory[i].second;

2
game.cpp
View File

@ -18,8 +18,6 @@ cell *lastmove;
enum eLastmovetype {lmSkip, lmMove, lmAttack, lmSpecial, lmPush, lmTree}; enum eLastmovetype {lmSkip, lmMove, lmAttack, lmSpecial, lmPush, lmTree};
eLastmovetype lastmovetype; eLastmovetype lastmovetype;
int sval = 100000000;
bool hauntedWarning; bool hauntedWarning;
bool survivalist; bool survivalist;

2
mapeditor.cpp
View File

@ -622,7 +622,7 @@ namespace mapeditor {
vector<pair<cellwalker, cellwalker> > spill_list; vector<pair<cellwalker, cellwalker> > spill_list;
void list_spill(cellwalker tgt, cellwalker src, manual_celllister& cl) { void list_spill(cellwalker tgt, cellwalker src, manual_celllister& cl) {
spill_list.clear(); sval++; spill_list.clear();
spill_list.emplace_back(tgt, src); spill_list.emplace_back(tgt, src);
int crad = 0, nextstepat = 0; int crad = 0, nextstepat = 0;
for(int i=0; i<isize(spill_list); i++) { for(int i=0; i<isize(spill_list); i++) {

7
rogueviz-kohonen.cpp
View File

@ -288,21 +288,20 @@ struct cellcrawler {
vector<cellcrawlerdata> data; vector<cellcrawlerdata> data;
void store(const cellwalker& o, int from, int spin, manual_celllister& cl) { 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); data.emplace_back(o, from, spin);
} }
void build(const cellwalker& start) { void build(const cellwalker& start) {
sval++;
data.clear(); data.clear();
manual_celllister cl; manual_celllister cl;
store(start, 0, 0); store(start, 0, 0, cl);
for(int i=0; i<isize(data); i++) { for(int i=0; i<isize(data); i++) {
cellwalker cw0 = data[i].orig; cellwalker cw0 = data[i].orig;
for(int j=0; j<cw0.c->type; j++) { for(int j=0; j<cw0.c->type; j++) {
cellwalker cw = cw0 + j + wstep; cellwalker cw = cw0 + j + wstep;
if(!getNeuron(cw.c)) continue; if(!getNeuron(cw.c)) continue;
store(cw, i, j); store(cw, i, j, cl);
} }
} }
if(gaussian) for(cellcrawlerdata& s: data) if(gaussian) for(cellcrawlerdata& s: data)