diff --git a/desktop_version/src/Logic.cpp b/desktop_version/src/Logic.cpp
index 71c5ac33..5f708556 100644
--- a/desktop_version/src/Logic.cpp
+++ b/desktop_version/src/Logic.cpp
@@ -122,6 +122,13 @@ void gamecompletelogic2(void)
 
 void gamelogic(void)
 {
+    /* Update old lerp positions of entities */
+    {size_t i; for (i = 0; i < obj.entities.size(); ++i)
+    {
+        obj.entities[i].lerpoldxp = obj.entities[i].xp;
+        obj.entities[i].lerpoldyp = obj.entities[i].yp;
+    }}
+
     //Misc
     if (map.towermode)
     {
diff --git a/desktop_version/src/main.cpp b/desktop_version/src/main.cpp
index feb87073..112ebc29 100644
--- a/desktop_version/src/main.cpp
+++ b/desktop_version/src/main.cpp
@@ -91,16 +91,6 @@ static void runscript(void)
     script.run();
 }
 
-static void gamemodefunc1(void)
-{
-    //Update old lerp positions of entities - has to be done BEFORE gameinput!
-    for (size_t i = 0; i < obj.entities.size(); i++)
-    {
-        obj.entities[i].lerpoldxp = obj.entities[i].xp;
-        obj.entities[i].lerpoldyp = obj.entities[i].yp;
-    }
-}
-
 static void teleportermodeinput(void)
 {
     if (game.useteleporter)
@@ -147,7 +137,6 @@ static const inline struct ImplFunc* get_gamestate_funcs(
 
     FUNC_LIST_BEGIN(GAMEMODE)
         {Func_fixed, runscript},
-        {Func_fixed, gamemodefunc1},
         {Func_fixed, gameinput},
         {Func_fixed, gamerenderfixed},
         {Func_delta, gamerender},