ENSEEIHT/projet-programmation-orientee-objet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.inpt.fr:tobgang/sagittarius

Browse source
This commit is contained in:
Laureηt 2021-05-14 11:19:09 +02:00
parent d5fafc5a3d 57f311733e
commit b7764ba62b
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/src/sagittarius/model/Arrow.java
View file

@ -214,17 +214,12 @@ public class Arrow extends EntityQuad {
Player player = (Player) actor; Player player = (Player) actor;
if (player == GameScreen.playerCurrent && TTL > 19.5) continue; if (player == GameScreen.playerCurrent && TTL > 19.5) continue;
if (Intersector.overlapConvexPolygons(player.hitbox, this.hitbox)) { if (Intersector.overlapConvexPolygons(player.hitbox, this.hitbox)) {
landed = true;
// Make a sound when an arrow killed somebody // Make a sound when an arrow killed somebody
if ( ! SagittariusGame.disableSounds){ if ( ! SagittariusGame.disableSounds){
long shotid = arrowHitSound.play(SagittariusGame.soundsVolume); long shotid = arrowHitSound.play(SagittariusGame.soundsVolume);
arrowHitSound.setPitch(shotid,1.5f); arrowHitSound.setPitch(shotid,1.5f);
} }
GameScreen.removePlayer(player);
GameScreen.arrows.removeActor(this);
GameScreen.nextPlayer();
GameScreen.setFocus(GameScreen.playerCurrent);
// Make a sound when an arrow touched
GameScreen.removePlayer(player); GameScreen.removePlayer(player);
break; break;