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

SQC-15_online #1

Merged
memartel merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +7 -7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99a5054c8f - Show all commits

14
SQCSim2021/remoteplayer.cpp
View File

@@ -145,7 +145,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else else
index = 9; index = 9;
} }
else if (current.states.jumping && current.states.shooting) { else if (current.states.jumping && current.states.shooting ) {
if (Shooting) if (Shooting)
index = 41; index = 41;
else else
@@ -165,13 +165,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else else
index = 10; index = 10;
} }
else if (current.states.jumping && current.states.shooting) { else if (current.states.jumping && current.states.shooting ) {
if (Shooting) if (Shooting)
index = 42; index = 42;
else else
index = 34; index = 34;
} }
else if (current.states.jumping) else if (current.states.jumping )
index = 26; index = 26;
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 1; index = 1;
@@ -185,13 +185,13 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else else
index = 12; index = 12;
} }
else if (current.states.jumping && current.states.shooting) { else if (current.states.jumping && current.states.shooting ) {
if (Shooting) if (Shooting)
index = 44; index = 44;
else else
index = 36; index = 36;
} }
else if (current.states.jumping) else if (current.states.jumping )
index = 28; index = 28;
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 3; index = 3;
@@ -230,7 +230,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else else
index = 40; index = 40;
} }
else if (current.states.jumping) else if (current.states.jumping )
index = 32; index = 32;
else if (current.states.running && current.states.still) else if (current.states.running && current.states.still)
index = 7; index = 7;
@@ -284,7 +284,7 @@ void RemotePlayer::Render(TextureAtlas& atlas, Shader& shader, Transformation tr
else else
index = 15; index = 15;
} }
else if (current.states.jumping && current.states.shooting) { else if (current.states.jumping && current.states.shooting ) {
if (Shooting) if (Shooting)
index = 47; index = 47;
else else