mark/wirm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

game(scripts/leavehouse): ref GameManager.Instance directly

Browse source
This commit is contained in:
Mark Joshwel 2025-02-14 21:12:49 +08:00
parent 94659dedc0
commit e458c43300
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Game/Assets/Scripts/LeaveHouseTrigger.cs
View file

@ -1,5 +1,5 @@
/*
Author: Reza and Wai Lam
Author: Reza, Wai Lam, Mark
Date: 10/2/25
Description: Verifies whether tasks in the house are completed before going to the next scene
*/
@ -36,11 +36,14 @@ public class LeaveHouseTrigger : MonoBehaviour
void ShowConfirmationButtons()
{
// FIXME: possibly refer to purely GameManager.Instance instead of any
// FIXED: possibly refer to purely GameManager.Instance instead of any
// early-bound reference to GameManager because the game manager might
// not have died fast enough for other scripts to refer to the new
// GameManager instance
// keeping this here for future ref
// --mark
Debug.Log("Current Day in ShowConfirmationButtons: " + GameManager.Instance.currentDay);
confirmationPanel.SetActive(true);
warningPanel.SetActive(true);
@ -77,13 +80,12 @@ public class LeaveHouseTrigger : MonoBehaviour
public void CancelLeave()
{
if (gameManager.currentDay == 2)
if (GameManager.Instance.currentDay == 2)
{
gameManager.IncrementDay();
GameManager.Instance.IncrementDay();
SceneManager.LoadScene(Day3);
}
confirmationPanel.SetActive(false);
warningPanel.SetActive(true);
}
}