diff --git a/Assets/Gothic-Core/Resources/Prefabs/Vobs/oCTriggerChangeLevel.prefab b/Assets/Gothic-Core/Resources/Prefabs/Vobs/oCTriggerChangeLevel.prefab index 1d8614e99..ee5bee9d5 100644 --- a/Assets/Gothic-Core/Resources/Prefabs/Vobs/oCTriggerChangeLevel.prefab +++ b/Assets/Gothic-Core/Resources/Prefabs/Vobs/oCTriggerChangeLevel.prefab @@ -75,7 +75,7 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 diff --git a/Assets/Gothic-Core/Scripts/Services/World/SaveGameService.cs b/Assets/Gothic-Core/Scripts/Services/World/SaveGameService.cs index 86822e2b9..b2ca74f72 100644 --- a/Assets/Gothic-Core/Scripts/Services/World/SaveGameService.cs +++ b/Assets/Gothic-Core/Scripts/Services/World/SaveGameService.cs @@ -139,7 +139,8 @@ public void LoadSavedGame(SlotId saveGameId, SaveGame save) public void ChangeWorld(string worldName) { // G2 has for example: AddonWorld\NewWorld.zen --> NewWorld.zen - CurrentWorldName = Path.GetFileName(worldName); + // Linux doesn't see \ as a directory separator, Windows sees both \ and / + CurrentWorldName = Path.GetFileName(worldName.Replace("\\","/")); // 1. World was already loaded. if (_worlds.ContainsKey(CurrentWorldName)) diff --git a/Assets/Gothic2/Scripts/Services/Context/G2ContextService.cs b/Assets/Gothic2/Scripts/Services/Context/G2ContextService.cs index 20f7ecd83..ec2208600 100644 --- a/Assets/Gothic2/Scripts/Services/Context/G2ContextService.cs +++ b/Assets/Gothic2/Scripts/Services/Context/G2ContextService.cs @@ -13,7 +13,7 @@ public class G2ContextService : IContextGameVersionService public GameVersion Version => GameVersion.Gothic2; string IContextGameVersionService.RootPath => _configService.Root.Gothic2Path; - public string CutsceneFileSuffix => "CSL"; + public string CutsceneFileSuffix => "LSC"; // FIXME - Load from GothicGame.ini public string InitialWorld => "newworld.zen";