1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-06-16 10:19:58 +00:00

rogueviz:: dftcolor is now colorpair, not int

This commit is contained in:
Zeno Rogue 2019-04-22 14:46:33 +02:00
parent 1a744ffc6b
commit 5965a622b5
2 changed files with 5 additions and 4 deletions

View File

@ -220,7 +220,7 @@ void storeall(int from) {
vdata[i].m->store(); vdata[i].m->store();
} }
int dftcolor = 0x282828FF; colorpair dftcolor = 0x282828FF;
namespace spiral { namespace spiral {
@ -1461,7 +1461,8 @@ void drawExtra() {
bool draw = true; bool draw = true;
for(int i=0; i<isize(named); i++) if(named[i] == c) draw = false; for(int i=0; i<isize(named); i++) if(named[i] == c) draw = false;
if(draw && gmatrix.count(c)) if(draw && gmatrix.count(c))
queuepolyat(it->second, shDisk, dftcolor, PPR::LINE); queuedisk(it->second, dftcolor, false, NULL);
// queuepolyat(it->second, shDisk, dftcolor., PPR::LINE);
} }
for(int i=0; i<isize(named); i++) if(gmatrix.count(named[i])) { for(int i=0; i<isize(named); i++) if(gmatrix.count(named[i])) {
@ -1621,7 +1622,7 @@ int readArgs() {
// options before reading // options before reading
if(0) ; if(0) ;
else if(argis("-dftcolor")) { else if(argis("-dftcolor")) {
shift(); dftcolor = arghex(); shift(); dftcolor = parse(args());
} }
// tree visualizer (e.g. Tree of Life) // tree visualizer (e.g. Tree of Life)

View File

@ -104,7 +104,7 @@ namespace rogueviz {
void run_snub(int v, int w); void run_snub(int v, int w);
} }
extern int dftcolor; extern colorpair dftcolor;
namespace collatz { extern double s2, s3, p2, p3; void start(); } namespace collatz { extern double s2, s3, p2, p3; void start(); }
namespace tree { void read(string fn); } namespace tree { void read(string fn); }
namespace sag { extern ld edgepower, edgemul; namespace sag { extern ld edgepower, edgemul;