From 6d22fce2d1574b5257dec53937d625312a98ceeb Mon Sep 17 00:00:00 2001 From: MickWerf Date: Sun, 7 Jun 2020 15:26:02 +0200 Subject: [PATCH] Move Character communication done --- core/src/netwerkprog/game/client/MainGame.java | 4 ++-- .../netwerkprog/game/client/game/map/GameInputProcessor.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java index 79063c3..5e55e37 100644 --- a/core/src/netwerkprog/game/client/MainGame.java +++ b/core/src/netwerkprog/game/client/MainGame.java @@ -396,9 +396,9 @@ public class MainGame extends Game implements ClientCallback { } else if (data instanceof MoveData) { MoveData moveData = (MoveData) data; if (moveData.getUsername().equals(this.username)) { - moveData.getTile().visit(); + moveData.getTile().visit(team.get(moveData.getCharacterName())); } else { - moveData.getTile().visit(); + moveData.getTile().visit(enemyTeam.get(moveData.getCharacterName())); } } diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java index c463a53..baf6e02 100644 --- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java +++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java @@ -10,9 +10,7 @@ import com.badlogic.gdx.utils.TimeUtils; import netwerkprog.game.client.MainGame; import netwerkprog.game.client.game.GAMESTATE; import netwerkprog.game.util.data.Data; -import netwerkprog.game.util.data.connection.ReadyData; -import netwerkprog.game.util.data.connection.TeamData; -import netwerkprog.game.util.game.Faction; +import netwerkprog.game.util.data.character.MoveData; import netwerkprog.game.util.game.GameCharacter; import java.util.ArrayList; @@ -182,6 +180,7 @@ public class GameInputProcessor implements InputProcessor { mainGame.setSelectedCharacter(gameTile.getCharacter()); mainGame.mapRenderer.setSurroundedTilesOfCurrentCharacter(col, row); } + mainGame.send(new MoveData(mainGame.getUsername(),mainGame.getSelectedCharacter().getName(),gameTile)); return true; } }