aboutsummaryrefslogtreecommitdiffstats
path: root/Assets/Scripts/Actors/Player.cs
diff options
context:
space:
mode:
authorNeil Kollack <nkollack@gmail.com>2022-04-13 01:05:13 -0500
committerNeil Kollack <nkollack@gmail.com>2022-04-13 01:05:13 -0500
commit9a902e09f35760e5ce7af6070e1f673476ded06e (patch)
treefb3974c45e83512f2e640f0d9793bd4a74464b54 /Assets/Scripts/Actors/Player.cs
parente1d53128f8d50d01235d7ba8013f485cd47a3e83 (diff)
fix: whip working same as prototype branch
Diffstat (limited to 'Assets/Scripts/Actors/Player.cs')
-rw-r--r--Assets/Scripts/Actors/Player.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Assets/Scripts/Actors/Player.cs b/Assets/Scripts/Actors/Player.cs
index 1edbbd7..97099eb 100644
--- a/Assets/Scripts/Actors/Player.cs
+++ b/Assets/Scripts/Actors/Player.cs
@@ -35,7 +35,8 @@ namespace MontanaJohns.Actors
protected override void Start()
{
base.Start();
- activeItem = gameObject.AddComponent<Whip>();
+ GameObject loadedItem = (GameObject)Instantiate(Resources.Load("ActiveItems/Whip"));
+ activeItem = loadedItem.GetComponent<Whip>();
}
protected void Update()