diff --git a/graph.cpp b/graph.cpp index 93f32f11..051fba0a 100644 --- a/graph.cpp +++ b/graph.cpp @@ -929,7 +929,11 @@ bool drawMonsterType(eMonster m, cell *where, const transmatrix& V, color_t col, transmatrix VWPN = cs.lefthanded ? VBS * Mirror : VBS; - if(peace::on || racing::on) ; + if(peace::on) ; + else if(racing::on) { + if(racing::trophy[multi::cpid]) + queuepoly(VWPN, shTrophy, racing::trophy[multi::cpid]); + } else if(items[itOrbThorns]) queuepoly(VWPN, shHedgehogBladePlayer, items[itOrbDiscord] ? watercolor(0) : 0x00FF00FF); else if(!shmup::on && items[itOrbDiscord]) diff --git a/polygons.cpp b/polygons.cpp index 8f5c33f7..ad5400fb 100644 --- a/polygons.cpp +++ b/polygons.cpp @@ -1555,7 +1555,7 @@ hpcshape shWolfBody, shWolfHead, shWolfLegs, shWolfEyes, shWolfFrontLeg, shWolfRearLeg, shWolfFrontPaw, shWolfRearPaw, shFemaleBody, shFemaleHair, shFemaleDress, shWitchDress, - shWitchHair, shBeautyHair, shFlowerHair, shFlowerHand, shSuspenders, + shWitchHair, shBeautyHair, shFlowerHair, shFlowerHand, shSuspenders, shTrophy, shBugBody, shBugArmor, shBugLeg, shBugAntenna, shPickAxe, shPike, shFlailBall, shFlailTrunk, shFlailChain, shHammerHead, shBook, shBookCover, shGrail, @@ -2519,6 +2519,7 @@ void buildpolys() { bshape(shWitchHair, PPR::MONSTER_HAIR, scalefactor, 129); bshape(shBeautyHair, PPR::MONSTER_HAIR, scalefactor, 130); bshape(shFlowerHair, PPR::MONSTER_HAT0, scalefactor, 131); + bshape(shTrophy, PPR::MONSTER_WPN, scalefactor, 388); bshape(shSuspenders, PPR::MONSTER_ARMOR1, scalefactor, 132); bshape(shFlowerHand, PPR::MONSTER_WPN, scalefactor, 133); bshape(shPFace, PPR::MONSTER_FACE, scalefactor, 134); @@ -3608,6 +3609,7 @@ NEWSHAPE, 385, 7, 1, 0.354675,0, NEWSHAPE, 386, 3, 1, 0.173768,0.275379, 0.340287,0.116342, 0.229291,-0.115277, NEWSHAPE, 387, 7, 1, 0.315263,-0.310217, 0.085056,-0.287538, +NEWSHAPE, 388, 1, 1, 0.046590,0.284199, 0.028110,0.325611, 0.098711,0.333738, 0.088761,0.294314, 0.090351,0.227036, 0.092387,0.196322, 0.129546,0.192006, 0.168982,0.166667, 0.173088,0.117700, 0.022882,0.091527, 0.004586,0.133004, 0.022981,0.160866, 0.052990,0.184313, 0.085413,0.193910, 0.055297,0.184324, NEWSHAPE }; diff --git a/racing.cpp b/racing.cpp index 982fca7d..6f254e1c 100644 --- a/racing.cpp +++ b/racing.cpp @@ -36,6 +36,8 @@ vector rti; vector track; map rti_id; +int trophy[MAXPLAYER]; + string track_code = "OFFICIAL"; transmatrix straight; @@ -432,6 +434,8 @@ void generate_track() { for(auto s: rti) if(s.c->monst == moIvyDead) s.c->monst = moNone; for(int i=0; i