Merge branch 'master' of git.inpt.fr:tobgang/sagittarius
This commit is contained in:
commit
b7764ba62b
|
@ -214,17 +214,12 @@ public class Arrow extends EntityQuad {
|
|||
Player player = (Player) actor;
|
||||
if (player == GameScreen.playerCurrent && TTL > 19.5) continue;
|
||||
if (Intersector.overlapConvexPolygons(player.hitbox, this.hitbox)) {
|
||||
landed = true;
|
||||
|
||||
// Make a sound when an arrow killed somebody
|
||||
if ( ! SagittariusGame.disableSounds){
|
||||
long shotid = arrowHitSound.play(SagittariusGame.soundsVolume);
|
||||
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);
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue