NeonTea/campfire
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stick being thrown when picking up casette

Browse Source
This commit is contained in:
Jens Pitkänen 2020-04-23 14:37:07 +03:00
parent f6e14e0ec4
commit d577b7ef9c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/ItemGrabber.cs
View File

@ -67,10 +67,12 @@ public class ItemGrabber : MonoBehaviour {
CanIgniteTorch |= Campfire != null && TorchableItem != null; CanIgniteTorch |= Campfire != null && TorchableItem != null;
} }
bool JustPickedUpCasette = false;
if (Casette != null && Input.GetButtonDown("Grab")) { if (Casette != null && Input.GetButtonDown("Grab")) {
Casette.Play(PreviousCasette); Casette.Play(PreviousCasette);
PreviousCasette = Casette; PreviousCasette = Casette;
Casette = null; Casette = null;
JustPickedUpCasette = true;
} else if (Campfire == null && LookedAtItem != null && Input.GetButtonDown("Grab")) { } else if (Campfire == null && LookedAtItem != null && Input.GetButtonDown("Grab")) {
LookedAtItem.PickUp(HandTransform); LookedAtItem.PickUp(HandTransform);
GrabbedItems.Add(LookedAtItem); GrabbedItems.Add(LookedAtItem);
@ -91,7 +93,7 @@ public class ItemGrabber : MonoBehaviour {
} }
} }
if (Input.GetButtonDown("Grab") && (LookedAtItem == null || Campfire != null) && ThrowableItem != null) { if (Input.GetButtonDown("Grab") && (LookedAtItem == null || Campfire != null) && ThrowableItem != null && !JustPickedUpCasette) {
Vector3 DropPosition; Vector3 DropPosition;
if (Campfire != null) { if (Campfire != null) {
DropPosition = Campfire.transform.position + Vector3.up * 0.7f; DropPosition = Campfire.transform.position + Vector3.up * 0.7f;