From 3203231509b42ef191c8e78c0bd0585fe99cd16f Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 4 Dec 2025 20:29:48 +0100 Subject: [PATCH] fixup --- rogueviz/rogueviz.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/rogueviz/rogueviz.h b/rogueviz/rogueviz.h index de81b0b4..b1791a18 100644 --- a/rogueviz/rogueviz.h +++ b/rogueviz/rogueviz.h @@ -72,13 +72,13 @@ namespace rogueviz { cell *orig; int lastdraw; edgetype *type; + int edge_id; edgeinfo(edgetype *t) { orig = NULL; lastdraw = -1; type = t; } + vector extenders; }; extern vector edgeinfos; - void addedge0(int i, int j, edgeinfo *ei); - void addedge(int i, int j, edgeinfo *ei); - void addedge(int i, int j, double wei, bool subdiv, edgetype *t); + void addedge(int i, int j, double wei, edgetype *t); extern vector legend; extern vector named; @@ -101,26 +101,34 @@ namespace rogueviz { shared_ptr img; #endif colorpair(color_t col = 0xC0C0C0FF) { shade = 0; color1 = color2 = col; } + bool operator == (const colorpair& cp) { + return tie(color1, color2, shade, img) == tie(cp.color1, cp.color2, cp.shade, cp.img); + } + bool operator != (const colorpair& cp) { return !(self == cp); } }; struct vertexdata { + int id; vector > edges; string name; colorpair cp; - edgeinfo *virt; bool special; int data; vector urls; vector infos; color_t spillcolor; shmup::monster *m; - vertexdata() { virt = NULL; m = NULL; special = false; spillcolor = DEFAULT_COLOR; } + vertexdata() { m = NULL; special = false; spillcolor = DEFAULT_COLOR; } + void be_nowhere(); + void be(cell *c, transmatrix at); }; extern vector vdata; + vertexdata& add_vertex(); + void resize_vertices(int n); + + extern int rv_quality; - void storeall(int from = 0); - extern bool showlabels; extern bool rog3; @@ -255,8 +263,6 @@ function roguevizslide_action(char c, const T& t, const U& act) #endif } - void createViz(int id, cell *c, transmatrix at); - extern map labeler; bool id_known(const string& s); int getid(const string& s);