From 5e0bd401fc7d8a5bfcf3d77aadb83baf7334733a Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Tue, 20 Nov 2018 00:20:11 +0100 Subject: [PATCH] tiny bird and tiny shark shapes, for use in RogueViz --- hyper.h | 2 +- polygons.cpp | 3 +++ rogueviz.cpp | 7 ++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hyper.h b/hyper.h index ae8f78a4..3d8757d3 100644 --- a/hyper.h +++ b/hyper.h @@ -4014,7 +4014,7 @@ ld frac(ld x); extern color_t poly_outline; -extern hpcshape shDisk, shTriangle, shHeptaMarker, shSnowball, shDiskT, shDiskS, shDiskSq, shDiskM; +extern hpcshape shDisk, shTriangle, shHeptaMarker, shSnowball, shDiskT, shDiskS, shDiskSq, shDiskM, shTinyBird, shTinyShark; extern std::mt19937 hrngen; diff --git a/polygons.cpp b/polygons.cpp index caf8d022..d44b7730 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1496,6 +1496,7 @@ hpcshape shCross, shGiantStar[2], shLake, shMirror, shHalfFloor[3], shHalfMirror[3], shGem[2], shStar, shDisk, shDiskT, shDiskS, shDiskM, shDiskSq, shRing, + shTinyBird, shTinyShark, shEgg, shSpikedRing, shTargetRing, shSawRing, shGearRing, shPeaceRing, shHeptaRing, shSpearRing, shLoveRing, @@ -2366,6 +2367,7 @@ void buildpolys() { bshape(shFoxTail2, PPR::MONSTER_BODY, scalefactor, 364); bshape(shHawk, PPR::MONSTER_BODY, scalefactor, 77); bshape(shEagle, PPR::MONSTER_BODY, scalefactor, 78); + bshape(shTinyBird, PPR::MONSTER_BODY, scalefactor / 2, 78); bshape(shWaterElemental, PPR::MONSTER_BODY, scalefactor, 81); bshape(shMouse, PPR::MONSTER_BODY, scalefactor, 82); bshape(shMouseLegs, PPR::MONSTER_LEG, scalefactor, 83); @@ -2489,6 +2491,7 @@ void buildpolys() { bshape(shPFace, PPR::MONSTER_FACE, scalefactor, 134); bshape(shEyes, PPR::MONSTER_EYE0, scalefactor, 135); bshape(shShark, PPR::MONSTER_BODY, scalefactor, 136); + bshape(shTinyShark, PPR::MONSTER_BODY, scalefactor / 2, 136); bshape(shBugBody, PPR::MONSTER_BODY, scalefactor, 137); bshape(shBugArmor, PPR::MONSTER_ARMOR0, scalefactor, 138); bshape(shBugLeg, PPR::MONSTER_BODY, scalefactor, 306); diff --git a/rogueviz.cpp b/rogueviz.cpp index bbfa30c2..c4ef6960 100644 --- a/rogueviz.cpp +++ b/rogueviz.cpp @@ -27,10 +27,6 @@ #include "rogueviz.h" -namespace hr { -extern hpcshape shEagle; -} - namespace rogueviz { const transmatrix centralsym = {{{-1,0,0}, {0,-1,0}, {0,0,-1}}}; @@ -1132,7 +1128,8 @@ void queuedisk(const transmatrix& V, const colorpair& cp, bool legend, const str if(cp.shade == 's') queuepoly(V1, shDiskS, darken_a(cp.color2)); if(cp.shade == 'q') queuepoly(V1, shDiskSq, darken_a(cp.color2)); if(cp.shade == 'm') queuepoly(V1, shDiskM, darken_a(cp.color2)); - if(cp.shade == 'b') queuepoly(V1, shEagle, darken_a(cp.color2)); + if(cp.shade == 'b') queuepoly(V1, shTinyBird, darken_a(cp.color2)); + if(cp.shade == 'f') queuepoly(V1, shTinyShark, darken_a(cp.color2)); } unordered_map, int> drawn_edges;