From 8869eac3020a6a2551ae79302859eb7826d81029 Mon Sep 17 00:00:00 2001
From: MaZiFAU <marco.alexander.zimmer@fau.de>
Date: Fri, 17 Sep 2021 15:00:38 +0200
Subject: [PATCH] merge fix 1
---
Assets/Scripts/InteractionEngine/FactHandling/Fact.cs | 6 ------
Assets/Scripts/Restart.cs | 6 ------
2 files changed, 12 deletions(-)
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
index 5c2aa93b..7f978207 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Fact.cs
@@ -163,12 +163,6 @@ public bool rename(string newLabel)
public abstract GameObject instantiateDisplay(GameObject prefab, Transform transform);
- public static void Clear()
- {
- MaxLabelId = 0;
- UnusedLabelIds.Clear();
- }
-
public virtual void delete(bool keep_clean = true)
{
//TODO: MMT: delete over there
diff --git a/Assets/Scripts/Restart.cs b/Assets/Scripts/Restart.cs
index 4b3e81e9..686d4198 100644
--- a/Assets/Scripts/Restart.cs
+++ b/Assets/Scripts/Restart.cs
@@ -9,15 +9,9 @@ public void LevelReset()
Loader.LoadStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder, false);
}
-<<<<<<< HEAD
- Fact.Clear();
-
- SceneManager.LoadSceneAsync(SceneManager.GetActiveScene().buildIndex);
-=======
public void LoadMainMenue()
{
SceneManager.LoadScene("MainMenue");
->>>>>>> MaZiFAU
}
public void LoadStartScreen()
--
GitLab