Merge remote-tracking branch 'refs/remotes/origin/Merge/GE-Server' in…

…to Merge/GE-Server
maelbecel · Jan 13, 2024 · 4aaa700 · 4aaa700
2 parents 7aebbe2 + 2df443b
commit 4aaa700
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Client/src/Layer/RTypeLayer.cpp b/Client/src/Layer/RTypeLayer.cpp
@@ -199,7 +199,7 @@ namespace RType {
                 std::string player = "Player_" + oss.str();
 
                 if ((tc.Tag.compare(player) == 0) && sc.Instance != nullptr) {
-                    //sc.Instance->OnKeyPressed(key);
+                    // sc.Instance->OnKeyPressed(key);
 
                     _Network->SendEvent(false, key, true);
                 }
@@ -223,7 +223,7 @@ namespace RType {
                 std::string player = "Player_" + oss.str();
 
                 if ((tc.Tag.compare(player) == 0) && sc.Instance != nullptr) {
-                    //sc.Instance->OnKeyReleased(key);
+                    // sc.Instance->OnKeyReleased(key);
                     _Network->SendEvent(false, key, false);
                 }
 

diff --git a/R-Type/src/Scripts/BulletEnnemy/BulletEnnemy.cpp b/R-Type/src/Scripts/BulletEnnemy/BulletEnnemy.cpp
@@ -63,7 +63,7 @@ namespace RType {
         });
 
         auto &bulletRBC = GetComponent<RigidBody2DComponent>();
-        auto &bulletTC  = GetComponent<TransformComponent>();
+        auto &bulletTC = GetComponent<TransformComponent>();
 
         bulletRBC.Velocity.x = -_Speed;
         bulletRBC.Type = RigidBody2DComponent::BodyType::Dynamic;

diff --git a/R-Type/src/Scripts/Pata-pata/Pata-pata.cpp b/R-Type/src/Scripts/Pata-pata/Pata-pata.cpp
@@ -143,13 +143,13 @@ namespace RType {
             bullet.AddComponent<ScriptComponent>().Bind("BulletEnnemy");
 
             SpriteRendererComponent &sprite = bullet.AddComponent<SpriteRendererComponent>();
-            ParentComponent         &parent = bullet.AddComponent<ParentComponent>();
-            IDComponent             &ID     = GetComponent<IDComponent>();
+            ParentComponent &parent = bullet.AddComponent<ParentComponent>();
+            IDComponent &ID = GetComponent<IDComponent>();
 
             parent.Parent = ID.ID;
 
             auto &tcBullet = bullet.GetComponent<TransformComponent>();
-            auto &tc       = GetComponent<TransformComponent>();
+            auto &tc = GetComponent<TransformComponent>();
 
             tcBullet.Translation = tc.Translation;
             tcBullet.Scale = {0.5f, 0.5f, 1.0f};