From 427df5e8fe71af0eb164869704e98a106642187d Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sun, 29 Mar 2020 15:23:18 +0200 Subject: [PATCH] patterns export patPalace, patZebraTriangles, patZebraLines --- pattern2.cpp | 6 +++--- rogueviz/rogueviz.cpp | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pattern2.cpp b/pattern2.cpp index eeae7d54..82c00018 100644 --- a/pattern2.cpp +++ b/pattern2.cpp @@ -2600,7 +2600,7 @@ EX namespace linepatterns { ) ); - linepattern patZebraTriangles("zebra triangles", 0x40FF4000, stdhyp_only, + EX linepattern patZebraTriangles = linepattern("zebra triangles", 0x40FF4000, stdhyp_only, ALLCELLS( if(zebra40(c) / 4 == 10) { bool all = true; @@ -2613,7 +2613,7 @@ EX namespace linepatterns { } ) ); - linepattern patZebraLines("zebra lines", 0xFF000000, stdhyp_only, + EX linepattern patZebraLines = linepattern("zebra lines", 0xFF000000, stdhyp_only, ALLCELLS( if(!pseudohept(c)) for(int i=0; itype; i+=2) { cell *c2 = createMov(c, i); @@ -2666,7 +2666,7 @@ EX namespace linepatterns { col, 1 + vid.linequality); ) ); - linepattern patPalace("firewall lines: Palace", 0xFFD50000, stdhyp_only, + EX linepattern patPalace = linepattern("firewall lines: Palace", 0xFFD50000, stdhyp_only, ALLCELLS( bool a = polarb50(c); if(pseudohept(c)) for(int i=0; i<7; i++) { diff --git a/rogueviz/rogueviz.cpp b/rogueviz/rogueviz.cpp index 73708755..aca21d41 100644 --- a/rogueviz/rogueviz.cpp +++ b/rogueviz/rogueviz.cpp @@ -20,12 +20,6 @@ #include "../hyper.h" #include "rogueviz.h" -namespace hr { - namespace linepatterns { - extern linepattern patPalace, patZebraTriangles, patZebraLines; - } - } - namespace rogueviz { ld fat_edges = 0;