ziver/evil-inside
1
0
Fork 0
Code Pull requests Releases Activity

lol

Browse source
This commit is contained in:
Jesper Lundin 2007-04-04 17:48:28 +00:00
parent acd4752826
commit c426ee3287
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ei/engine/scene/Sprite.java
View file

@ -84,16 +84,16 @@ public class Sprite extends Entity {
public void update() { public void update() {
if(moveTo!=null) { if(moveTo!=null) {
if(moveTo.getX()>getLocation().getX()) { if(moveTo.getX()>getLocation().getX()) {
getLocation().add(0.5f, 0f, 0f); getLocation().add(1.5f, 0f, 0f);
} }
if(moveTo.getY()>getLocation().getY()) { if(moveTo.getY()>getLocation().getY()) {
getLocation().add(0f, 0.5f, 0f); getLocation().add(0f, 1.5f, 0f);
} }
if(moveTo.getX()<getLocation().getX()) { if(moveTo.getX()<getLocation().getX()) {
getLocation().add(-0.5f, 0f, 0f); getLocation().add(-1.5f, 0f, 0f);
} }
if(moveTo.getY()<getLocation().getY()) { if(moveTo.getY()<getLocation().getY()) {
getLocation().add(0f, -0.5f, 0f); getLocation().add(0f, -1.5f, 0f);
} }
if(moveTo.getX()==getLocation().getX() && moveTo.getY()==getLocation().getY()) { if(moveTo.getX()==getLocation().getX() && moveTo.getY()==getLocation().getY()) {
moveTo = null; moveTo = null;

2
src/ei/game/gamestate/InGameState.java
View file

@ -27,7 +27,7 @@ public class InGameState extends GameState{
rootNode.add(player.getNode()); rootNode.add(player.getNode());
Tank tank = new Tank(); Tank tank = new Tank();
player.addUnit(tank); player.addUnit(tank);
tank.move(10, 10); //tank.move(10, 3);
} }
public static Human getHuman(){ public static Human getHuman(){
return player; return player;

2
src/ei/game/scene/units/Unit.java
View file

@ -36,7 +36,7 @@ public abstract class Unit extends GameEntity{
InGameState.getMap().removePos(oldPos.getX(), oldPos.getY()); InGameState.getMap().removePos(oldPos.getX(), oldPos.getY());
} }
setPos(x, y); setPos(x, y);
looks.move(new Vector2f(x, y)); looks.move(InGameState.getMap().getPixelByPos((int)x, (int)y));
oldPos = new Vector2i(x, y); oldPos = new Vector2i(x, y);
} }