aboutsummaryrefslogtreecommitdiff
path: root/td/Assets/Scripts/cameraHandler.cs
diff options
context:
space:
mode:
authorJakob Stendahl <jakobste@uio.no>2020-11-11 20:46:46 +0100
committerJakob Stendahl <jakobste@uio.no>2020-11-11 20:46:46 +0100
commit773e9d4a49001fb35da1df98f6bdfe964aa08f3b (patch)
tree0bd879b2dc5d4bfd7c05e8aa7d863bb724e99f9e /td/Assets/Scripts/cameraHandler.cs
parenta0795799b6746b041ab7e35a58feac0cd403464a (diff)
downloadTD-master.tar.gz
TD-master.zip
Update to new Unity versionHEADmaster
Diffstat (limited to 'td/Assets/Scripts/cameraHandler.cs')
-rw-r--r--td/Assets/Scripts/cameraHandler.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/td/Assets/Scripts/cameraHandler.cs b/td/Assets/Scripts/cameraHandler.cs
index 7c2f75f..a3b447d 100644
--- a/td/Assets/Scripts/cameraHandler.cs
+++ b/td/Assets/Scripts/cameraHandler.cs
@@ -29,13 +29,13 @@ public class CameraHandler : MonoBehaviour {
void Update() {
if (Player.GameIsPaused()) { return; }
- // If there's an open menu, or the clicker is being pressed, ignore the touch.
- /*
- if (GameManager.Instance.MenuManager.HasOpenMenu || GameManager.Instance.BitSpawnManager.IsSpawningBits) {
+ // If there's an open menu, or the clicker is being pressed, ignore the touch.
+ if (Player.MainGui._sidebarExpanded) { return; }
+ /*if (GameManager.Instance.MenuManager.HasOpenMenu || GameManager.Instance.BitSpawnManager.IsSpawningBits) {
return;
}*/
- if (Input.touchSupported && Application.platform != RuntimePlatform.WebGLPlayer) {
+ if (Input.touchSupported && Application.platform != RuntimePlatform.WebGLPlayer) {
HandleTouch();
} else {
HandleMouse();