diff --git a/geometry.cpp b/geometry.cpp index efb01c52..eec9aaa6 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -343,7 +343,7 @@ hpcshape shDodeca, shSmallerDodeca, shLightningBolt, shHumanoid, shHalfHumanoid, shHourglass, - shShield; + shShield, shSmallFan; 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 92c03c4b..a9727e39 100644 --- a/graph.cpp +++ b/graph.cpp @@ -1112,6 +1112,8 @@ 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) @@ -1131,12 +1133,13 @@ EX bool drawItemType(eItem it, cell *c, const shiftmatrix& V, color_t icol, int (it == itOrbSafety || it == itOrbFreedom || it == itOrbRecall) ? &cgi.shDiskSq : (it == itOrbEnergy) ? &cgi.shHalfDisk : (it == itOrbSpace) ? &cgi.shSmallPirateHook : - (it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism || it == itOrbDiscord) ? &cgi.shEccentricDisk : + (it == itOrbChoice || it == itOrbMirror || it == itOrbMagnetism || it == itOrbEmpathy || it == itOrbDiscord) ? &cgi.shEccentricDisk : (it == itOrbPsi || it == itOrbSide3) ? &cgi.shDiskS : (it == itOrbPurity) ? &cgi.shSmallEgg : (it == itOrbLightning) ? &cgi.shLightningBolt : (it == itOrbShield) ? &cgi.shShield : (it == itOrbTime) ? &cgi.shHourglass : + (it == itOrbAir) ? &cgi.shSmallFan : (it == itOrbIllusion || it == itOrbInvis || it == itOrbTeleport) ? &cgi.shHumanoid : (it == itOrbPhasing || it == itOrbDash) ? &cgi.shDiskSegment : NULL; diff --git a/polygons.cpp b/polygons.cpp index 6f724d16..0f46d193 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1266,6 +1266,7 @@ void geometry_information::prepare_shapes() { bshape(shTreat, PPR::ITEM, scalefactor, 253); bshape(shSmallTreat, PPR::ITEM, scalefactor/1.5, 253); bshape(shLightningBolt, PPR::ITEM, scalefactor/1.5, 413); + bshape(shSmallFan, PPR::ITEM, scalefactor/3, 59); bshape(shHumanoid, PPR::ITEM, scalefactor/5.5, 414); bshape(shHalfHumanoid, PPR::ITEM, scalefactor/5.5, 415); bshape(shHourglass, PPR::ITEM, scalefactor/2.0, 416);