diff --git a/src/ei/engine/test/TextTest.java b/src/ei/engine/test/TextTest.java index 2a814be..1e75a0e 100644 --- a/src/ei/engine/test/TextTest.java +++ b/src/ei/engine/test/TextTest.java @@ -2,7 +2,6 @@ package ei.engine.test; import ei.engine.LWJGLGameWindow; import ei.engine.effects.BitmapText; -import ei.engine.effects.Text; import ei.engine.math.Vector2f; public class TextTest extends LWJGLGameWindow{ diff --git a/src/ei/game/input/InGameMouseInput.java b/src/ei/game/input/InGameMouseInput.java index c296b89..f8ff487 100644 --- a/src/ei/game/input/InGameMouseInput.java +++ b/src/ei/game/input/InGameMouseInput.java @@ -6,9 +6,9 @@ import ei.engine.LWJGLGameWindow; import ei.engine.input.MouseInput; import ei.engine.math.Vector2i; import ei.engine.scene.Sprite; +import ei.engine.util.MultiPrintStream; import ei.game.scene.GameEntity; import ei.game.scene.Map; -import ei.game.scene.units.Unit; public class InGameMouseInput extends MouseInput{ private static final int CAMERA_MOVE_BORDER = 40; @@ -49,7 +49,6 @@ public class InGameMouseInput extends MouseInput{ if(y > LWJGLGameWindow.getHeight()-CAMERA_MOVE_BORDER){ LWJGLGameWindow.getCamera().getLocation().add(0,-CAMERA_MOVE_SPEED,0); } - //System.out.println(x+"-"+y); } @Override @@ -59,14 +58,15 @@ public class InGameMouseInput extends MouseInput{ LWJGLGameWindow.getCamera().getLocation().getX()+x, LWJGLGameWindow.getCamera().getLocation().getY()+(LWJGLGameWindow.getHeight()-y)); if(!map.isPosEmpty(pos.getX(), pos.getY())){ + //map.printAllUnits(); selected.clear(); - System.out.println(pos.getX()+", "+pos.getY()); + MultiPrintStream.out.println("Selecting: "+pos.getX()+", "+pos.getY()); selected.add(map.getPos(pos.getX(), pos.getY())); } else{ + MultiPrintStream.out.println("Moving: "+pos.getX()+", "+pos.getY()); for(int i=0; i