Massive amount of refactoring for local multiplayer, annotations

2018-05-12 07:30:23 -07:00
parent 959f756ff5
commit 00e70cbb6a
47 changed files with 610 additions and 510 deletions
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -287,7 +287,7 @@ public class Player extends Unit{
 		movement.y += ya*speed;
 		movement.x += xa*speed;

-		boolean shooting = control.input().canShoot() && control.input().isShooting() && inventory.hasAmmo();
+		boolean shooting = control.input(playerIndex).canShoot() && control.input(playerIndex).isShooting() && inventory.hasAmmo();

 		if(shooting){
 			weapon.update(this, true);