From 0a58329c88be81409089db771eb5d06bde5779b5 Mon Sep 17 00:00:00 2001
From: Victor Giers <mail@victorgiers.com>
Date: Sat, 11 Apr 2026 11:17:13 +0200
Subject: [PATCH] Remove preferred navigation mode logic, update status
 messages

---
 src/app/App.tsx | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/src/app/App.tsx b/src/app/App.tsx
index e32881dd..1eb3e651 100644
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -6517,19 +6517,17 @@ export function App({ store, initialStatusMessage }: AppProps) {
       const nextRuntimeScene = buildRuntimeSceneForProjectScene(
         editorState.activeSceneId
       );
-      const nextNavigationMode = preferredNavigationMode;
 
       applyRuntimeSceneSession(editorState.activeSceneId, nextRuntimeScene);
       setRuntimeMessage(null);
       setFirstPersonTelemetry(null);
       setRuntimeInteractionPrompt(null);
       setRuntimeGlobalState(createDefaultRuntimeGlobalState());
-      setActiveNavigationMode(nextNavigationMode);
       store.enterPlayMode();
       setStatusMessage(
-        nextNavigationMode === "firstPerson"
+        nextRuntimeScene.navigationMode === "firstPerson"
           ? "Entered run mode with first-person navigation."
-          : "Entered run mode with Orbit Visitor."
+          : "Entered run mode with third-person navigation."
       );
     } catch (error) {
       setStatusMessage(`Run mode could not start: ${getErrorMessage(error)}`);
@@ -6545,31 +6543,11 @@ export function App({ store, initialStatusMessage }: AppProps) {
     setRuntimeMessage(null);
     setFirstPersonTelemetry(null);
     setRuntimeInteractionPrompt(null);
+    setActiveNavigationMode("thirdPerson");
     store.exitPlayMode();
     setStatusMessage("Returned to editor mode.");
   };
 
-  const handleSetPreferredNavigationMode = (
-    navigationMode: RuntimeNavigationMode
-  ) => {
-    setPreferredNavigationMode(navigationMode);
-
-    if (navigationMode === "firstPerson" && primaryPlayerStart === null) {
-      setStatusMessage(
-        "First Person selected. Author a Player Start before running, or switch back to Orbit Visitor."
-      );
-    }
-
-    if (editorState.toolMode === "play") {
-      setActiveNavigationMode(navigationMode);
-      setStatusMessage(
-        navigationMode === "firstPerson"
-          ? "Runner switched to first-person navigation."
-          : "Runner switched to Orbit Visitor."
-      );
-    }
-  };
-
   const createAssetMenuHoverHandler =
     (assetId: string) => (hovered: boolean) => {
       setHoveredAssetId((current) =>