Skip to content

Commit 06ce37d

Browse files
Merge pull request #368 from Gothic-Unity-Project/stack/01-fixes-standalone
Stack/01 fixes standalone
2 parents c7a7653 + c535b10 commit 06ce37d

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

Assets/Gothic-Core/Resources/Prefabs/Vobs/oCTriggerChangeLevel.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ BoxCollider:
7575
serializedVersion: 2
7676
m_Bits: 0
7777
m_LayerOverridePriority: 0
78-
m_IsTrigger: 0
78+
m_IsTrigger: 1
7979
m_ProvidesContacts: 0
8080
m_Enabled: 1
8181
serializedVersion: 3

Assets/Gothic-Core/Scripts/Services/World/SaveGameService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ public void LoadSavedGame(SlotId saveGameId, SaveGame save)
139139
public void ChangeWorld(string worldName)
140140
{
141141
// G2 has for example: AddonWorld\NewWorld.zen --> NewWorld.zen
142-
CurrentWorldName = Path.GetFileName(worldName);
142+
// Linux doesn't see \ as a directory separator, Windows sees both \ and /
143+
CurrentWorldName = Path.GetFileName(worldName.Replace("\\","/"));
143144

144145
// 1. World was already loaded.
145146
if (_worlds.ContainsKey(CurrentWorldName))

Assets/Gothic2/Scripts/Services/Context/G2ContextService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class G2ContextService : IContextGameVersionService
1313

1414
public GameVersion Version => GameVersion.Gothic2;
1515
string IContextGameVersionService.RootPath => _configService.Root.Gothic2Path;
16-
public string CutsceneFileSuffix => "CSL";
16+
public string CutsceneFileSuffix => "LSC";
1717

1818
// FIXME - Load from GothicGame.ini
1919
public string InitialWorld => "newworld.zen";

0 commit comments

Comments
 (0)