Separating state out of the location

src/game_server/InternalGameServer.h

@@ -1,20 +1,17 @@
 #pragma once
 
 #include "IGameServer.h"
-
-class AudioPlayerAsync;
+#include "IGameServerLifecycle.h"
 
 namespace FRG {
 
-class Game;
-class Character;
-class Location;
+class LocalGameServerHost;
 struct LocationConfig;
-struct LocationSetup;
 
 // In-process implementation used by single-player.  GameState exists exactly
 // once, here; clients see immutable snapshots and mutate it with typed commands.
-class InternalGameServer final : public IGameServer {
+class InternalGameServer final
+	: public IGameServer, public IGameServerLifecycle {
 public:
 	InternalGameServer();
 
@@ -25,9 +22,14 @@ public:
 	void update(std::int64_t deltaMs) override;
 	void save(nlohmann::json& out) const override;
 	void load(const nlohmann::json& in) override;
+	void startCampaign(
+		const CampaignConfig& campaign, const std::string& zipFile,
+		bool createLocalPlayer, bool enableTestBot) override;
+	bool prepareLocation(const LocationConfig& config) override;
+	void activateLocation(const std::string& locationId) override;
 
 private:
-	friend class Game;
+	friend class LocalGameServerHost;
 
 	// Host-only lifecycle operations. They never expose authoritative state and
 	// are intentionally absent from IGameServer.
@@ -36,17 +38,6 @@ private:
 		const std::string& zipFile);
 	void clearCampaign();
 	void resetCampaign(const std::string& questsPath, const std::string& zipFile);
-	bool prepareLocation(const LocationConfig& config);
-	void setupRuntimeLocation(
-		const std::string& id, const std::shared_ptr<Location>& location,
-		LocationSetup params, AudioPlayerAsync* audioPlayer);
-	Location* runtimeLocation(const std::string& id) const;
-	bool hasRuntimeLocation(const std::string& id) const;
-	std::vector<std::string> loadedRuntimeLocationIds() const;
-	void clearRuntimeLocations(bool retainState);
-	void bindRuntimeLocation(const std::string& id, std::shared_ptr<Location> location);
-	void synchronizeRuntimeAuxiliaryState();
-	void applyStateToRuntime();
 	void publishMutation();
 	void ensureBattleZoneTestBot();
 	void updateBattleZoneTestBot(std::int64_t deltaMs);
@@ -55,8 +46,12 @@ private:
 
 	GameState state_;
 	std::string localPlayerId_ = "player";
+	std::string resourceZipFile_;
 	std::int64_t battleZoneTestBotElapsedMs_ = 0;
-	std::unordered_map<std::string, std::shared_ptr<Location>> runtimeLocations_;
+	bool battleZoneTestBotEnabled_ = false;
+	std::string pendingSimulationLocationId_;
+	LocationSimulationEvents pendingSimulationEvents_;
+	std::vector<std::pair<std::string, std::string>> pendingTriggerZoneUpdates_;
 	std::uint64_t revision_ = 1;
 	mutable std::uint64_t cachedRevision_ = 0;
 	mutable std::shared_ptr<const GameSnapshot> cachedSnapshot_;