From 3e8497f43bf4ef7d0cad103811af91a664068bae Mon Sep 17 00:00:00 2001
From: Claudel-D-Roy <112507354+Claudel-D-Roy@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:22:49 -0500
Subject: [PATCH 1/2] :dizzy:

---
 SQCSim2021/remoteplayer.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/SQCSim2021/remoteplayer.cpp b/SQCSim2021/remoteplayer.cpp
index f896d4f..e355ae2 100644
--- a/SQCSim2021/remoteplayer.cpp
+++ b/SQCSim2021/remoteplayer.cpp
@@ -145,13 +145,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 9;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 41;
 			else
 				index = 33;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 25;
 		else if (current.states.running && current.states.still)
 			index = 0;
@@ -165,13 +165,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 10;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 42;
 			else
 				index = 34;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 26;
 		else if (current.states.running && current.states.still)
 			index = 1;
@@ -185,13 +185,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 12;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 44;
 			else
 				index = 36;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 28;
 		else if (current.states.running && current.states.still)
 			index = 3;
@@ -205,13 +205,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 14;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 46;
 			else
 				index = 38;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 30;
 		else if (current.states.running && current.states.still)
 			index = 5;
@@ -224,13 +224,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 16;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 48;
 			else
 				index = 40;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 32;
 		else if (current.states.running && current.states.still)
 			index = 7;
@@ -244,13 +244,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 11;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 43;
 			else
 				index = 35;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 27;
 		else if (current.states.running && current.states.still)
 			index = 2;
@@ -264,13 +264,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 13;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 45;
 			else
 				index = 37;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 29;
 		else if (current.states.running && current.states.still)
 			index = 4;
@@ -284,13 +284,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 15;
 		}
-		else if (current.states.jumping && current.states.shooting) {
+		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
 			if (Shooting)
 				index = 47;
 			else
 				index = 39;
 		}
-		else if (current.states.jumping)
+		else if (current.states.jumping && m_position.y > 0)
 			index = 31;
 		else if (current.states.running && current.states.still)
 			index = 6;

From 0a08a22c600899713d8c83ff63d8a9bcb788a590 Mon Sep 17 00:00:00 2001
From: Claudel-D-Roy <112507354+Claudel-D-Roy@users.noreply.github.com>
Date: Thu, 7 Dec 2023 12:31:04 -0500
Subject: [PATCH 2/2] Jump && shoot

---
 SQCSim2021/remoteplayer.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/SQCSim2021/remoteplayer.cpp b/SQCSim2021/remoteplayer.cpp
index e355ae2..f423f40 100644
--- a/SQCSim2021/remoteplayer.cpp
+++ b/SQCSim2021/remoteplayer.cpp
@@ -145,13 +145,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 9;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting ) {
 			if (Shooting)
 				index = 41;
 			else
 				index = 33;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping)
 			index = 25;
 		else if (current.states.running && current.states.still)
 			index = 0;
@@ -165,13 +165,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 10;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting ) {
 			if (Shooting)
 				index = 42;
 			else
 				index = 34;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping )
 			index = 26;
 		else if (current.states.running && current.states.still)
 			index = 1;
@@ -185,13 +185,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 12;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting ) {
 			if (Shooting)
 				index = 44;
 			else
 				index = 36;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping )
 			index = 28;
 		else if (current.states.running && current.states.still)
 			index = 3;
@@ -205,13 +205,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 14;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting) {
 			if (Shooting)
 				index = 46;
 			else
 				index = 38;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping)
 			index = 30;
 		else if (current.states.running && current.states.still)
 			index = 5;
@@ -224,13 +224,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 16;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting) {
 			if (Shooting)
 				index = 48;
 			else
 				index = 40;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping )
 			index = 32;
 		else if (current.states.running && current.states.still)
 			index = 7;
@@ -244,13 +244,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 11;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting) {
 			if (Shooting)
 				index = 43;
 			else
 				index = 35;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping)
 			index = 27;
 		else if (current.states.running && current.states.still)
 			index = 2;
@@ -264,13 +264,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 13;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting) {
 			if (Shooting)
 				index = 45;
 			else
 				index = 37;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping)
 			index = 29;
 		else if (current.states.running && current.states.still)
 			index = 4;
@@ -284,13 +284,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
 			else
 				index = 15;
 		}
-		else if (current.states.jumping && current.states.shooting && m_position.y > 0) {
+		else if (current.states.jumping && current.states.shooting ) {
 			if (Shooting)
 				index = 47;
 			else
 				index = 39;
 		}
-		else if (current.states.jumping && m_position.y > 0)
+		else if (current.states.jumping)
 			index = 31;
 		else if (current.states.running && current.states.still)
 			index = 6;