diff --git a/geometry.cpp b/geometry.cpp index eec9aaa6..36fdb842 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -343,7 +343,7 @@ hpcshape shDodeca, shSmallerDodeca, shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass, - shShield, shSmallFan; + shShield, shSmallFan, shTreeIcon; hpcshape shFrogRearFoot, shFrogFrontFoot, shFrogRearLeg, shFrogFrontLeg, shFrogRearLeg2, shFrogBody, shFrogEye, shFrogStripe, shFrogJumpFoot, shFrogJumpLeg, shSmallFrogRearFoot, shSmallFrogFrontFoot, shSmallFrogRearLeg, shSmallFrogFrontLeg, shSmallFrogRearLeg2, shSmallFrogBody; diff --git a/graph.cpp b/graph.cpp index a9727e39..05e55ab9 100644 --- a/graph.cpp +++ b/graph.cpp @@ -1112,8 +1112,6 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int queuepolyat(Vit, cgi.shHalfHumanoid, dark, prio); queuepolyat(Vit*Mirror, cgi.shHalfHumanoid, 0xFF, prio); } - //else if (it == itOrbAir) - // queuepolyat(Vit, cgi.shSmallFan, dark, prio); else if (it == itOrbFlash) queuepolyat(Vit, cgi.shFlash, dark, prio); else if (it == itOrbMatter || it == itOrbStone) @@ -1140,6 +1138,7 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int (it == itOrbShield) ? &cgi.shShield : (it == itOrbTime) ? &cgi.shHourglass : (it == itOrbAir) ? &cgi.shSmallFan : + (it == itOrbWoods) ? &cgi.shTreeIcon : (it == itOrbIllusion || it == itOrbInvis || it == itOrbTeleport) ? &cgi.shHumanoid : (it == itOrbPhasing || it == itOrbDash) ? &cgi.shDiskSegment : NULL; diff --git a/polygons.cpp b/polygons.cpp index 0f46d193..39c94226 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1271,6 +1271,7 @@ void geometry_information::prepare_shapes() { bshape(shHalfHumanoid, PPR::ITEM, scalefactor/5.5, 415); bshape(shHourglass, PPR::ITEM, scalefactor/2.0, 416); bshape(shShield, PPR::ITEM, scalefactor, 418); + bshape(shTreeIcon, PPR::ITEM, scalefactor/1.7, 419); wormscale = WDIM == 3 ? 3 : 1; @@ -2442,6 +2443,12 @@ NEWSHAPE, 417, 1, 1, -0.037181, 0.070167, -0.042053, 0.031041, -0.014659, 0.0293 // shShield NEWSHAPE, 418, 1, 2, 0.055384, -0.005846, 0.043076, 0.010769, 0.033846, 0.033846, 0.036615, 0.052307, 0.056923, 0.092307, 0.030153, 0.092461, 0.004615, 0.084615, -0.017538, 0.080000, -0.049230, 0.068615, -0.066461, 0.058461, -0.079692, 0.041538, -0.092769, 0.016000, -0.092307, -0.005384, +// shTreeIcon +#define x (-.2) +#define y (-.220) +NEWSHAPE, 419, 1, 1, +0.210+x,0.045+y, 0.300+x,0.172+y, 0.270+x,0.176+y, 0.318+x,0.245+y, 0.274+x,0.250+y, 0.344+x,0.327+y, 0.230+x,0.330+y, 0.210+x,0.385+y, + NEWSHAPE, NEWSHAPE };