mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-01-06 01:00:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Mister_Nebula 2022-02-05 10:17:46 +00:00
commit 2f52ab9cae
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
QSB/Menus/MenuManager.cs
View File

@ -126,7 +126,7 @@ namespace QSB.Menus
{
OneButtonInfoPopup.SetUpPopup(message, InputLibrary.menuConfirm, InputLibrary.cancel, new ScreenPrompt(okButtonText), null, true, false);
OWTime.Pause(OWTime.PauseType.System);
OWTime.Pause(OWTime.PauseType.Menu);
OWInput.ChangeInputMode(InputMode.Menu);
var pauseCommandListener = Locator.GetPauseCommandListener();
@ -143,7 +143,7 @@ namespace QSB.Menus
{
TwoButtonInfoPopup.SetUpPopup(message, InputLibrary.menuConfirm, InputLibrary.cancel, new ScreenPrompt(okButtonText), new ScreenPrompt(cancelButtonText), true, true);
OWTime.Pause(OWTime.PauseType.System);
OWTime.Pause(OWTime.PauseType.Menu);
OWInput.ChangeInputMode(InputMode.Menu);
var pauseCommandListener = Locator.GetPauseCommandListener();
@ -165,7 +165,7 @@ namespace QSB.Menus
_addedPauseLock = false;
}
OWTime.Unpause(OWTime.PauseType.System);
OWTime.Unpause(OWTime.PauseType.Menu);
OWInput.RestorePreviousInputs();
PopupOK?.SafeInvoke();

1
QSB/TimeSync/Patches/TimePatches.cs
View File

@ -16,6 +16,7 @@ namespace QSB.TimeSync.Patches
DebugLog.DebugWrite($"OnStartOfTimeLoop");
return false;
}
[HarmonyPrefix]
[HarmonyPatch(typeof(OWTime), nameof(OWTime.Pause))]
public static bool StopPausing(OWTime.PauseType pauseType)