From e02dcdf69d6f15c17540bdf7df6bb3c9a1813c8f Mon Sep 17 00:00:00 2001
From: Alexander Batalov <alex.batalov@gmail.com>
Date: Tue, 13 Dec 2022 13:20:55 +0300
Subject: [PATCH] Fix car disappearing when using town interface

---
 src/worldmap.cc | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/worldmap.cc b/src/worldmap.cc
index 57e4a24..8e2b544 100644
--- a/src/worldmap.cc
+++ b/src/worldmap.cc
@@ -3169,6 +3169,14 @@ static int wmWorldMapFunc(int a1)
 
                     if (map != -1) {
                         if (wmGenData.isInCar) {
+                            // SFALL: Fix for the car being lost when entering a
+                            // location via the Town/World button and then
+                            // leaving on foot.
+                            //
+                            // CE: Fix is very different, but looks right -
+                            // matches the code above (processing mouse events).
+                            wmGenData.isInCar = false;
+
                             wmMatchAreaContainingMapIdx(map, &(wmGenData.currentCarAreaId));
                         }