|
|
|
@ -210,32 +210,32 @@ public: |
|
|
|
|
if (GetKey(olc::F1).bPressed) { |
|
|
|
|
ConsoleShow(olc::F1,false); |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::D).bPressed||GetKey(olc::RIGHT).bPressed) { |
|
|
|
|
if (GetKey(olc::D).bPressed||GetKey(olc::RIGHT).bPressed||GetKey(olc::NP6).bPressed) { |
|
|
|
|
changeAnimation(playerAnimWalkRight); |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::A).bPressed||GetKey(olc::LEFT).bPressed) { |
|
|
|
|
if (GetKey(olc::A).bPressed||GetKey(olc::LEFT).bPressed||GetKey(olc::NP4).bPressed) { |
|
|
|
|
changeAnimation(playerAnimWalkLeft); |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::W).bPressed||GetKey(olc::UP).bPressed) { |
|
|
|
|
if (GetKey(olc::W).bPressed||GetKey(olc::UP).bPressed||GetKey(olc::NP8).bPressed) { |
|
|
|
|
changeAnimation(playerAnimWalkUp); |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::S).bPressed||GetKey(olc::DOWN).bPressed) { |
|
|
|
|
if (GetKey(olc::S).bPressed||GetKey(olc::DOWN).bPressed||GetKey(olc::NP5).bPressed||GetKey(olc::NP2).bPressed) { |
|
|
|
|
changeAnimation(playerAnimWalkDown); |
|
|
|
|
} |
|
|
|
|
if (!GetKey(olc::D).bHeld&&!GetKey(olc::RIGHT).bHeld&& |
|
|
|
|
!GetKey(olc::A).bHeld&&!GetKey(olc::LEFT).bHeld&& |
|
|
|
|
!GetKey(olc::S).bHeld&&!GetKey(olc::UP).bHeld&& |
|
|
|
|
!GetKey(olc::W).bHeld&&!GetKey(olc::DOWN).bHeld) { |
|
|
|
|
if (GetKey(olc::D).bReleased||GetKey(olc::RIGHT).bReleased) { |
|
|
|
|
if (!GetKey(olc::D).bHeld&&!GetKey(olc::RIGHT).bHeld&&!GetKey(olc::NP6).bHeld&& |
|
|
|
|
!GetKey(olc::A).bHeld&&!GetKey(olc::LEFT).bHeld&&!GetKey(olc::NP4).bHeld&& |
|
|
|
|
!GetKey(olc::S).bHeld&&!GetKey(olc::UP).bHeld&&!GetKey(olc::NP8).bHeld&& |
|
|
|
|
!GetKey(olc::W).bHeld&&!GetKey(olc::DOWN).bHeld&&!GetKey(olc::NP5).bHeld&&!GetKey(olc::NP2).bHeld) { |
|
|
|
|
if (GetKey(olc::D).bReleased||GetKey(olc::RIGHT).bReleased||GetKey(olc::NP6).bReleased) { |
|
|
|
|
changeAnimation(playerAnimRight); |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::A).bReleased||GetKey(olc::LEFT).bReleased) { |
|
|
|
|
if (GetKey(olc::A).bReleased||GetKey(olc::LEFT).bReleased||GetKey(olc::NP4).bReleased) { |
|
|
|
|
changeAnimation(playerAnimLeft); |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::W).bReleased||GetKey(olc::UP).bReleased) { |
|
|
|
|
if (GetKey(olc::W).bReleased||GetKey(olc::UP).bReleased||GetKey(olc::NP8).bReleased) { |
|
|
|
|
changeAnimation(playerAnim); |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::S).bReleased||GetKey(olc::DOWN).bReleased) { |
|
|
|
|
if (GetKey(olc::S).bReleased||GetKey(olc::DOWN).bReleased||GetKey(olc::NP5).bReleased||GetKey(olc::NP2).bReleased) { |
|
|
|
|
changeAnimation(playerAnimDown); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -315,7 +315,7 @@ public: |
|
|
|
|
|
|
|
|
|
if (CURRENT_CUTSCENE==NONE&&!messageBoxVisible) { |
|
|
|
|
bool changed=false; |
|
|
|
|
if (GetKey(olc::D).bHeld||GetKey(olc::RIGHT).bHeld) { |
|
|
|
|
if (GetKey(olc::D).bHeld||GetKey(olc::RIGHT).bHeld||GetKey(olc::NP6).bHeld) { |
|
|
|
|
PLAYER_COORDS[0]=clamp(PLAYER_COORDS[0]+MOVE_SPD,0.1,(double)MAP_WIDTH); |
|
|
|
|
ConsoleClear(); |
|
|
|
|
cout<<"("<<PLAYER_COORDS[0]<<","<<PLAYER_COORDS[1]<<+")"; |
|
|
|
@ -324,7 +324,7 @@ public: |
|
|
|
|
changed=true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::A).bHeld||GetKey(olc::LEFT).bHeld) { |
|
|
|
|
if (GetKey(olc::A).bHeld||GetKey(olc::LEFT).bHeld||GetKey(olc::NP4).bHeld) { |
|
|
|
|
PLAYER_COORDS[0]=clamp(PLAYER_COORDS[0]-MOVE_SPD,0.1,(double)MAP_WIDTH); |
|
|
|
|
ConsoleClear(); |
|
|
|
|
cout<<"("<<PLAYER_COORDS[0]<<","<<PLAYER_COORDS[1]<<+")"; |
|
|
|
@ -333,7 +333,7 @@ public: |
|
|
|
|
changed=true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::W).bHeld||GetKey(olc::UP).bHeld) { |
|
|
|
|
if (GetKey(olc::W).bHeld||GetKey(olc::UP).bHeld||GetKey(olc::NP8).bHeld) { |
|
|
|
|
PLAYER_COORDS[1]=clamp(PLAYER_COORDS[1]-MOVE_SPD,0.1,(double)MAP_HEIGHT); |
|
|
|
|
ConsoleClear(); |
|
|
|
|
cout<<"("<<PLAYER_COORDS[0]<<","<<PLAYER_COORDS[1]<<+")"; |
|
|
|
@ -342,7 +342,7 @@ public: |
|
|
|
|
changed=true; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (GetKey(olc::S).bHeld||GetKey(olc::DOWN).bHeld) { |
|
|
|
|
if (GetKey(olc::S).bHeld||GetKey(olc::DOWN).bHeld||GetKey(olc::NP5).bHeld||GetKey(olc::NP2).bHeld) { |
|
|
|
|
PLAYER_COORDS[1]=clamp(PLAYER_COORDS[1]+MOVE_SPD,0.1,(double)MAP_HEIGHT); |
|
|
|
|
ConsoleClear(); |
|
|
|
|
cout<<"("<<PLAYER_COORDS[0]<<","<<PLAYER_COORDS[1]<<+")"; |
|
|
|
|