Remove text floaters after moving to another map or elevation

Fixes #401
alexbatalov · Jan 21, 2025 · 2e14e46 · 2e14e46
1 parent 95d92d8
commit 2e14e46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/map.cc b/src/map.cc
@@ -1255,6 +1255,9 @@ int mapHandleTransition()
     } else {
         if (!isInCombat()) {
             if (gMapTransition.map != gMapHeader.field_34 || gElevation == gMapTransition.elevation) {
+                // SFALL: Remove text floaters after moving to another map.
+                textObjectsReset();
+
                 mapLoadById(gMapTransition.map);
             }
 

diff --git a/src/object.cc b/src/object.cc
@@ -1476,6 +1476,9 @@ int objectSetLocation(Object* obj, int tile, int elevation, Rect* rect)
         }
 
         if (elevation != oldElevation) {
+            // SFALL: Remove text floaters after moving to another elevation.
+            textObjectsReset();
+
             mapSetElevation(elevation);
             tileSetCenter(tile, TILE_SET_CENTER_REFRESH_WINDOW | TILE_SET_CENTER_FLAG_IGNORE_SCROLL_RESTRICTIONS);
             if (isInCombat()) {