memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'SQC-15_online' of https://github.com/CegepSTH/SQCSim2023 into SQC-15_online

Browse Source
This commit is contained in:
MarcEricMartel
2023-12-07 12:32:45 -05:00
parent 74b808f46b 0a08a22c60
commit 99a5054c8f
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SQCSim2021/remoteplayer.cpp
View File

@@ -145,7 +145,7 @@ 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 ) {
if (Shooting)
index = 41;
else
@@ -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 ) {
if (Shooting)
index = 42;
else
index = 34;
}
else if (current.states.jumping)
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) {
else if (current.states.jumping && current.states.shooting ) {
if (Shooting)
index = 44;
else
index = 36;
}
else if (current.states.jumping)
else if (current.states.jumping )
index = 28;
else if (current.states.running && current.states.still)
index = 3;
@@ -230,7 +230,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else
index = 40;
}
else if (current.states.jumping)
else if (current.states.jumping )
index = 32;
else if (current.states.running && current.states.still)
index = 7;
@@ -284,7 +284,7 @@ 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 ) {
if (Shooting)
index = 47;
else