Restructure game init

project-fika · May 15, 2024 · 45b61fd · 45b61fd
1 parent ce6ed44
commit 45b61fd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs
@@ -660,8 +660,8 @@ public override async Task<LocalPlayer> vmethod_2(int playerId, Vector3 position
 
             LocalPlayer myPlayer = await CoopPlayer.Create(playerId, spawnPoint.Position, spawnPoint.Rotation, "Player", "Main_", EPointOfView.FirstPerson, profile,
                 false, UpdateQueue, Player.EUpdateMode.Auto, Player.EUpdateMode.Auto,
-                GClass549.Config.CharacterController.ClientPlayerMode, () => Singleton<SharedGameSettingsClass>.Instance.Control.Settings.MouseSensitivity,
-                () => Singleton<SharedGameSettingsClass>.Instance.Control.Settings.MouseAimingSensitivity, new GClass1445(), MatchmakerAcceptPatches.IsServer ? 0 : 1000, questController);
+                GClass549.Config.CharacterController.ClientPlayerMode, getSensitivity,
+                getAimingSensitivity, new GClass1445(), MatchmakerAcceptPatches.IsServer ? 0 : 1000, questController);
 
             profile.SetSpawnedInSession(profile.Side == EPlayerSide.Savage);
 
@@ -1009,6 +1009,10 @@ public override IEnumerator vmethod_4(float startDelay, BotControllerSettings co
                     Logger.LogError("CoopGame::vmethod_4: Halloween controller could not be instantiated!");
                 }
             }
+            if (GClass549.Config.FixedFrameRate > 0f)
+            {
+                FixedDeltaTime = 1f / GClass549.Config.FixedFrameRate;
+            }
 
             bool isWinter = BackEndSession.IsWinter;
             Class420 winterEventController = new();