Merge branch 'release/0.0.5'

* release/0.0.5: build settings disable input on initial tutorial
elton999 · May 14, 2023 · 6b7932a · 6b7932a
2 parents be3c24a + e66275f
commit 6b7932a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@
 
 # Define required raylib variables
 PROJECT_NAME       ?= ProjectLight
-RAYLIB_VERSION     ?= 0.0.4
+RAYLIB_VERSION     ?= 0.0.5
 RAYLIB_PATH        ?= C:/raylib/raylib
 
 # Define compiler path on Windows

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
@@ -43,6 +43,9 @@ void Player::Input()
         return;
     }
 
+    if (!InputIsEnabled)
+        return;
+
     if (IsKeyDown(KEY_A))
         Direction.x = -1;
     if (IsKeyDown(KEY_D))

diff --git a/src/Entities/Player.h b/src/Entities/Player.h
@@ -46,6 +46,8 @@ class Player : public SpriteAnimation, public CollisionCharacter, public IResetS
     PlayerFlashLight *FlashLight;
     Backpack *PlayerBackpack;
 
+    bool InputIsEnabled{false};
+
     float LineTargetLength{50.0f};
 
     virtual void Start() override;

diff --git a/src/UI/UI_InputTutorial.cpp b/src/UI/UI_InputTutorial.cpp
@@ -1,5 +1,6 @@
 #include "UI_InputTutorial.h"
 #include "../Window.h"
+#include "../Scene/Scene.h"
 
 void UI_InputTutorial::Start()
 {
@@ -37,7 +38,10 @@ void UI_InputTutorial::Update(float dt)
     mouseAnimation->Update(dt);
 
     if (_timeShowingMouseAnimation <= 0)
+    {
+        GetScene()->GetPlayer()->InputIsEnabled = true;
         Hide();
+    }
 }
 
 void UI_InputTutorial::Draw()