From 1ea6b88f818c7f8c1efa3107ccbcfc353cdfed9b Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 1 Aug 2024 12:25:34 +0200 Subject: [PATCH] rogueviz:: better spillcolor --- rogueviz/graphs.cpp | 5 +++-- rogueviz/rogueviz.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rogueviz/graphs.cpp b/rogueviz/graphs.cpp index a8999f43..b0811ef3 100644 --- a/rogueviz/graphs.cpp +++ b/rogueviz/graphs.cpp @@ -510,7 +510,8 @@ bool drawVertex(const shiftmatrix &V, cell *c, shmup::monster *m) { if(m->type != moRogueviz) return false; int i = m->pid; vertexdata& vd = vdata[i]; - + + if(vd.spillcolor != DEFAULT_COLOR) c->landparam = vd.spillcolor >> 8; // bool ghilite = false; // if(vd.special && specialmark) ghilite = true; @@ -816,7 +817,7 @@ void readcolor(const string& cfname) { color_t col; int err = fscanf(f, "%08x", &col); if(err <= 0) throw hstream_exception("reading dot-color"); - action = [col] (vertexdata &vd) { vd.m->base->landparam = col >> 8; }; + action = [col] (vertexdata &vd) { vd.spillcolor = col; }; } else if(c2 == '/') { string s = str_to_eol(); diff --git a/rogueviz/rogueviz.h b/rogueviz/rogueviz.h index d8462297..99bf881d 100644 --- a/rogueviz/rogueviz.h +++ b/rogueviz/rogueviz.h @@ -112,8 +112,9 @@ namespace rogueviz { int data; vector urls; vector infos; + color_t spillcolor; shmup::monster *m; - vertexdata() { virt = NULL; m = NULL; special = false; } + vertexdata() { virt = NULL; m = NULL; special = false; spillcolor = DEFAULT_COLOR; } }; extern vector vdata;