diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index 0850aad0..443d48fa 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -967,49 +967,49 @@ void gamelogic(void) continue; } - if (game.roomx == 118 && game.roomy == 102 && obj.entities[i].rule==1 && !map.custommode) + if (game.roomx == 118 && game.roomy == 102 && obj.entities[i].rule==1 && !map.custommode) + { + //ascii snakes + if (obj.entities[i].xp <= -80) { - //ascii snakes - if (obj.entities[i].xp <= -80) + if (obj.entities[i].isplatform) { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp + 400, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].xp += 400; - obj.entities[i].lerpoldxp += 400; - } - else if (obj.entities[i].xp > 320) - { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp - 400, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].xp -= 400; - obj.entities[i].lerpoldxp -= 400; + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp + 400, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); } + obj.entities[i].xp += 400; + obj.entities[i].lerpoldxp += 400; } - else + else if (obj.entities[i].xp > 320) { - if (obj.entities[i].xp <= -10) + if (obj.entities[i].isplatform) { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp + 320, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].xp += 320; - obj.entities[i].lerpoldxp += 320; - } - else if (obj.entities[i].xp > 310) - { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp - 320, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].xp -= 320; - obj.entities[i].lerpoldxp -= 320; + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp - 400, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); } + obj.entities[i].xp -= 400; + obj.entities[i].lerpoldxp -= 400; } + } + else + { + if (obj.entities[i].xp <= -10) + { + if (obj.entities[i].isplatform) + { + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp + 320, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); + } + obj.entities[i].xp += 320; + obj.entities[i].lerpoldxp += 320; + } + else if (obj.entities[i].xp > 310) + { + if (obj.entities[i].isplatform) + { + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp - 320, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); + } + obj.entities[i].xp -= 320; + obj.entities[i].lerpoldxp -= 320; + } + } } } @@ -1023,24 +1023,24 @@ void gamelogic(void) continue; } - if (obj.entities[i].yp <= -12) + if (obj.entities[i].yp <= -12) + { + if (obj.entities[i].isplatform) { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp, obj.entities[i].yp + 232, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].yp += 232; - obj.entities[i].lerpoldyp += 232; + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp, obj.entities[i].yp + 232, obj.entities[i].w, obj.entities[i].h); } - else if (obj.entities[i].yp > 226) + obj.entities[i].yp += 232; + obj.entities[i].lerpoldyp += 232; + } + else if (obj.entities[i].yp > 226) + { + if (obj.entities[i].isplatform) { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp, obj.entities[i].yp - 232, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].yp -= 232; - obj.entities[i].lerpoldyp -= 232; + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp, obj.entities[i].yp - 232, obj.entities[i].w, obj.entities[i].h); } + obj.entities[i].yp -= 232; + obj.entities[i].lerpoldyp -= 232; + } } } @@ -1055,24 +1055,24 @@ void gamelogic(void) continue; } - if (obj.entities[i].xp <= -30) + if (obj.entities[i].xp <= -30) + { + if (obj.entities[i].isplatform) { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp + 350, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].xp += 350; - obj.entities[i].lerpoldxp += 350; + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp + 350, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); } - else if (obj.entities[i].xp > 320) + obj.entities[i].xp += 350; + obj.entities[i].lerpoldxp += 350; + } + else if (obj.entities[i].xp > 320) + { + if (obj.entities[i].isplatform) { - if (obj.entities[i].isplatform) - { - obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp - 350, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); - } - obj.entities[i].xp -= 350; - obj.entities[i].lerpoldxp -= 350; + obj.moveblockto(obj.entities[i].xp, obj.entities[i].yp, obj.entities[i].xp - 350, obj.entities[i].yp, obj.entities[i].w, obj.entities[i].h); } + obj.entities[i].xp -= 350; + obj.entities[i].lerpoldxp -= 350; + } } }