From 474252bdfe25f5491679e181938fe2ea850132f4 Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Mon, 18 Dec 2023 01:13:40 +0000
Subject: [PATCH] Added pausing + menu, Overhauled soundmanager + menu handling
---
Assets/Scripts/PlayerController.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index f918a23..028469a 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -63,7 +63,7 @@
{
get
{
- return animator.GetBool(AnimationStrings.canMove);
+ return animator.GetBool(AnimationStrings.canMove) && !PauseMenu.GameIsPaused;
}
}
@@ -159,9 +159,14 @@
}
}
+ public void TakeDamage(int damage)
+ {
+ health.Hit(damage);
+ }
+
public void TakeFallDamage(int fallDamage)
{
- health.Hit(fallDamage);
+ TakeDamage(fallDamage);
}
//public void OnRun(InputAction.CallbackContext context)
--
Gitblit v1.9.3