Fixed tightrope incorrect offset

Arisotura · Aug 18, 2018 · 22bfa0b · 22bfa0b
1 parent 0415475
commit 22bfa0b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/objectrenderer.cpp b/objectrenderer.cpp
@@ -2291,18 +2291,18 @@ void TightropeRenderer::render(QPainter *painter, QRect *)
     if (spr->getNybble(11) <=7)
     {
         for(heightoffset = 0; heightoffset < spr->getNybble(11); heightoffset++);
-        painter->drawLine(spr->getx(), spr->gety()+10, spr->getx()+ropelength-4, spr->gety()+10-(heightoffset*20));
-        painter->drawPixmap(QRect(spr->getx()-8+ropelength,spr->gety()+2-(heightoffset*20), 16, 16), ImageCache::getInstance()->get(SpriteImg, "rope_joint.png"));
+        painter->drawLine(spr->getx(), spr->gety(), spr->getx()+ropelength-4, spr->gety()-(heightoffset*20));
+        painter->drawPixmap(QRect(spr->getx()-8+ropelength,spr->gety()-10-(heightoffset*20), 16, 16), ImageCache::getInstance()->get(SpriteImg, "rope_joint.png"));
     }
     else
     {
         heightoffset = 160;
         for (int i = 8; i != spr->getNybble(11); i++) heightoffset -= 20;
-        painter->drawLine(spr->getx(), spr->gety()+10, spr->getx()+ropelength-4, spr->gety()+10+heightoffset);
-        painter->drawPixmap(QRect(spr->getx()-8+ropelength,spr->gety()+2+heightoffset, 16, 16), ImageCache::getInstance()->get(SpriteImg, "rope_joint.png"));
+        painter->drawLine(spr->getx(), spr->gety(), spr->getx()+ropelength-4, spr->gety()+heightoffset);
+        painter->drawPixmap(QRect(spr->getx()-8+ropelength,spr->gety()-10+heightoffset, 16, 16), ImageCache::getInstance()->get(SpriteImg, "rope_joint.png"));
     }
 
-    painter->drawPixmap(QRect(spr->getx()-8,spr->gety()+2, 16, 16), ImageCache::getInstance()->get(SpriteImg, "rope_joint.png"));
+    painter->drawPixmap(QRect(spr->getx()-8,spr->gety()-10, 16, 16), ImageCache::getInstance()->get(SpriteImg, "rope_joint.png"));
 
     painter->setPen(Qt::NoPen);
 }

diff --git a/objects.cpp b/objects.cpp
@@ -1454,20 +1454,24 @@ void Sprite::setRect()
         }
         int offset;
         if (getNybble(11) == 0)
+        {
             height = 20;
+            offsety = -10;
+        }
         else if (getNybble(11) <= 7)
         {
             for(offset = 0; offset < getNybble(11); offset++)
             {
                 height = (offset*20)+40;
-                offsety = -(offset*20)-20;
+                offsety = -(offset*20)-30;
             }
         }
         else
         {
             offset = 160;
             for (int i = 8; i != getNybble(11); i++) offset -= 20;
             height = offset+20;
+            offsety = -10;
         }
         offsetx = -10;
         break;