diff --git a/desktop_version/src/Graphics.cpp b/desktop_version/src/Graphics.cpp index 851ea03e..4bcb0c72 100644 --- a/desktop_version/src/Graphics.cpp +++ b/desktop_version/src/Graphics.cpp @@ -2332,10 +2332,12 @@ void Graphics::drawtowermap_nobackground() void Graphics::drawtowerspikes() { + int spikeleveltop = lerp(map.oldspikeleveltop, map.spikeleveltop); + int spikelevelbottom = lerp(map.oldspikelevelbottom, map.spikelevelbottom); for (int i = 0; i < 40; i++) { - drawtile3(i * 8, -8+map.spikeleveltop, 9, map.colstate); - drawtile3(i * 8, 230-map.spikelevelbottom, 8, map.colstate); + drawtile3(i * 8, -8+spikeleveltop, 9, map.colstate); + drawtile3(i * 8, 230-spikelevelbottom, 8, map.colstate); } } diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp index b4240af0..2bcf1da0 100644 --- a/desktop_version/src/Logic.cpp +++ b/desktop_version/src/Logic.cpp @@ -261,6 +261,8 @@ void gamelogic() if (map.towermode) { map.oldypos = map.ypos; + map.oldspikeleveltop = map.spikeleveltop; + map.oldspikelevelbottom = map.spikelevelbottom; if(!game.completestop) { if (map.cameramode == 0) diff --git a/desktop_version/src/Map.cpp b/desktop_version/src/Map.cpp index e2926e01..d026ea05 100644 --- a/desktop_version/src/Map.cpp +++ b/desktop_version/src/Map.cpp @@ -13,6 +13,8 @@ mapclass::mapclass() colsuperstate = 0; spikeleveltop = 0; spikelevelbottom = 0; + oldspikeleveltop = 0; + oldspikelevelbottom = 0; warpx = false; warpy = false; extrarow = 0; @@ -1152,6 +1154,8 @@ void mapclass::loadlevel(int rx, int ry) extrarow = 0; spikeleveltop = 0; spikelevelbottom = 0; + oldspikeleveltop = 0; + oldspikelevelbottom = 0; //Custom stuff for warplines obj.customwarpmode=false; diff --git a/desktop_version/src/Map.h b/desktop_version/src/Map.h index ac276e17..1ed4cc48 100644 --- a/desktop_version/src/Map.h +++ b/desktop_version/src/Map.h @@ -113,6 +113,7 @@ public: int colstate, colstatedelay; int colsuperstate; int spikeleveltop, spikelevelbottom; + int oldspikeleveltop, oldspikelevelbottom; bool tdrawback; int bscroll; //final level navigation