From fe61e9898f27aaf679f2e2ef4bac8b8ac1b1ae4f Mon Sep 17 00:00:00 2001 From: in0finite Date: Sun, 30 Jan 2022 01:06:45 +0100 Subject: [PATCH] rename --- Assets/Scripts/Behaviours/Audio/AudioManager.cs | 2 +- Assets/Scripts/Behaviours/World/EntranceExitMapObject.cs | 2 +- Assets/Scripts/Behaviours/World/StaticGeometry.cs | 4 ++-- Assets/Scripts/Editor/AssetExporter.cs | 2 +- Assets/Scripts/Editor/EditorLoader.cs | 8 ++++---- Assets/Scripts/Networking/CustomNetworkManager.cs | 2 +- Assets/Scripts/UI/TouchInput.cs | 2 +- Assets/Scripts/Utilities/CoroutineManager.cs | 2 +- Assets/Scripts/Utilities/F.cs | 4 ++-- Assets/Scripts/Utilities/SingletonComponent.cs | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Assets/Scripts/Behaviours/Audio/AudioManager.cs b/Assets/Scripts/Behaviours/Audio/AudioManager.cs index 1e99dde6..7ee4c6a9 100644 --- a/Assets/Scripts/Behaviours/Audio/AudioManager.cs +++ b/Assets/Scripts/Behaviours/Audio/AudioManager.cs @@ -128,7 +128,7 @@ namespace SanAndreasUnity.Behaviours.Audio audioSource.Play(); // destroy game object when sound is finished playing - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) Destroy( audioSource.gameObject, clip.length ); return audioSource; diff --git a/Assets/Scripts/Behaviours/World/EntranceExitMapObject.cs b/Assets/Scripts/Behaviours/World/EntranceExitMapObject.cs index 1f43d52e..2cf69b92 100644 --- a/Assets/Scripts/Behaviours/World/EntranceExitMapObject.cs +++ b/Assets/Scripts/Behaviours/World/EntranceExitMapObject.cs @@ -44,7 +44,7 @@ namespace SanAndreasUnity.Behaviours.World info.TargetInterior), Quaternion.identity); - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) gameObject.SetActive(false); gameObject.isStatic = true; diff --git a/Assets/Scripts/Behaviours/World/StaticGeometry.cs b/Assets/Scripts/Behaviours/World/StaticGeometry.cs index a15d8683..b93aa46c 100644 --- a/Assets/Scripts/Behaviours/World/StaticGeometry.cs +++ b/Assets/Scripts/Behaviours/World/StaticGeometry.cs @@ -138,7 +138,7 @@ namespace SanAndreasUnity.Behaviours.World this.SetDrawDistance(ObjectDefinition?.DrawDist ?? 0); - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) gameObject.SetActive(false); gameObject.isStatic = true; } @@ -299,7 +299,7 @@ namespace SanAndreasUnity.Behaviours.World private bool NeedsFading() { - if (F.IsAppInEditTime) + if (F.IsAppInEditMode) return false; if (F.IsInHeadlessMode) diff --git a/Assets/Scripts/Editor/AssetExporter.cs b/Assets/Scripts/Editor/AssetExporter.cs index ec06ed85..2ff30489 100644 --- a/Assets/Scripts/Editor/AssetExporter.cs +++ b/Assets/Scripts/Editor/AssetExporter.cs @@ -176,7 +176,7 @@ namespace SanAndreasUnity.Editor if (this.IsExportingFromGameFiles) { - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) { EditorUtility.DisplayDialog("", "This type of export can only run in edit-mode.", "Ok"); yield break; diff --git a/Assets/Scripts/Editor/EditorLoader.cs b/Assets/Scripts/Editor/EditorLoader.cs index d07bb80f..4bdf1333 100644 --- a/Assets/Scripts/Editor/EditorLoader.cs +++ b/Assets/Scripts/Editor/EditorLoader.cs @@ -21,7 +21,7 @@ namespace SanAndreasUnity.Editor static void EditorUpdate() { - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) return; if (Loader.IsLoading) @@ -39,7 +39,7 @@ namespace SanAndreasUnity.Editor { EditorUtility.ClearProgressBar(); - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) return; if (Loader.HasLoaded) @@ -51,7 +51,7 @@ namespace SanAndreasUnity.Editor [MenuItem(EditorCore.MenuName + "/" + "Load game data")] static void MenuItemLoadGameData() { - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) { EditorUtility.DisplayDialog("", "This can only be used in edit mode.", "Ok"); return; @@ -74,7 +74,7 @@ namespace SanAndreasUnity.Editor [MenuItem(EditorCore.MenuName + "/" + "Change path to GTA")] static void MenuItemChangePath() { - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) { EditorUtility.DisplayDialog("", "Exit play mode first.", "Ok"); return; diff --git a/Assets/Scripts/Networking/CustomNetworkManager.cs b/Assets/Scripts/Networking/CustomNetworkManager.cs index de92de11..c88f8ef1 100644 --- a/Assets/Scripts/Networking/CustomNetworkManager.cs +++ b/Assets/Scripts/Networking/CustomNetworkManager.cs @@ -46,7 +46,7 @@ namespace SanAndreasUnity.Net void OnLoaderFinished() { - if (F.IsAppInEditTime) + if (F.IsAppInEditMode) return; if (NetStatus.IsServer) // don't do anything on server diff --git a/Assets/Scripts/UI/TouchInput.cs b/Assets/Scripts/UI/TouchInput.cs index 73fda83a..74e68eb8 100644 --- a/Assets/Scripts/UI/TouchInput.cs +++ b/Assets/Scripts/UI/TouchInput.cs @@ -104,7 +104,7 @@ namespace SanAndreasUnity.UI void OnLoaderFinished() { - if (F.IsAppInEditTime) + if (F.IsAppInEditMode) return; // assign textures to movement buttons' arrows diff --git a/Assets/Scripts/Utilities/CoroutineManager.cs b/Assets/Scripts/Utilities/CoroutineManager.cs index ec52f9dc..ba00b27a 100644 --- a/Assets/Scripts/Utilities/CoroutineManager.cs +++ b/Assets/Scripts/Utilities/CoroutineManager.cs @@ -19,7 +19,7 @@ namespace SanAndreasUnity.Utilities static void EditorUpdate() { - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) return; m_coroutineRunner.Update(); diff --git a/Assets/Scripts/Utilities/F.cs b/Assets/Scripts/Utilities/F.cs index 44c9d755..7c205d53 100644 --- a/Assets/Scripts/Utilities/F.cs +++ b/Assets/Scripts/Utilities/F.cs @@ -421,7 +421,7 @@ namespace SanAndreasUnity.Utilities public static void DestroyEvenInEditMode(Object obj) { - if (F.IsAppInEditTime) + if (F.IsAppInEditMode) Object.DestroyImmediate(obj, false); else Object.Destroy(obj); @@ -1063,7 +1063,7 @@ namespace SanAndreasUnity.Utilities } } - public static bool IsAppInEditTime + public static bool IsAppInEditMode { get { diff --git a/Assets/Scripts/Utilities/SingletonComponent.cs b/Assets/Scripts/Utilities/SingletonComponent.cs index 6d2862b8..0a33c90a 100644 --- a/Assets/Scripts/Utilities/SingletonComponent.cs +++ b/Assets/Scripts/Utilities/SingletonComponent.cs @@ -26,7 +26,7 @@ namespace SanAndreasUnity.Utilities { get { - if (!F.IsAppInEditTime) + if (!F.IsAppInEditMode) { return s_cachedSingleton; }