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

Fixed som bugs with unit

Browse source
This commit is contained in:
Ziver Koc 2007-04-16 16:13:44 +00:00
parent da8ec6f899
commit a7749878f0
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,8 +24,8 @@ public class InGameState extends GameState{
HumanPlayer player = new HumanPlayer(); HumanPlayer player = new HumanPlayer();
player.addUnit(new Tank()); player.addUnit(new Tank());
player.addUnit(new Tank(0,1)); player.addUnit(new Tank(1,0));
player.addUnit(new Tank(0,2)); player.addUnit(new Tank(2,0));
rootNode.add(player.getNode()); rootNode.add(player.getNode());
PlayerHandler.getInstance().addPlayer(player); PlayerHandler.getInstance().addPlayer(player);
} }

3
src/ei/game/scene/units/Tank.java
View file

@ -1,6 +1,7 @@
package ei.game.scene.units; package ei.game.scene.units;
import ei.engine.math.Vector2f; import ei.engine.math.Vector2f;
import ei.engine.math.Vector2i;
import ei.engine.math.Vector4f; import ei.engine.math.Vector4f;
import ei.engine.scene.Box; import ei.engine.scene.Box;
import ei.engine.scene.Entity; import ei.engine.scene.Entity;
@ -14,7 +15,7 @@ public class Tank extends Unit{
} }
public Tank(int x, int y){ public Tank(int x, int y){
super(10); super(10, new Vector2i(x,y));
Sprite sp = new Sprite("Tank", "data/units/tank.png"); Sprite sp = new Sprite("Tank", "data/units/tank.png");
sp.setSize(new Vector2f(50,37)); sp.setSize(new Vector2f(50,37));
getNode().add(sp); getNode().add(sp);

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

@ -35,11 +35,13 @@ public abstract class Unit extends GameEntity{
* *
* @param l The max life of the unit * @param l The max life of the unit
*/ */
public Unit(int l) { public Unit(int l, Vector2i pos) {
super(l); super(l);
unitNode = new Node("unit"); unitNode = new Node("unit");
setPos(0, 0); unitNode.setLocation(Map.getPixelByPos(pos.getX(), pos.getY()));
setPos(pos.getX(), pos.getY());
} }
public void setSelected(boolean b) { public void setSelected(boolean b) {
super.setSelected(b); super.setSelected(b);
if(b) { if(b) {
@ -66,8 +68,7 @@ public abstract class Unit extends GameEntity{
*/ */
public void setPos(int x, int y) { public void setPos(int x, int y) {
oldPos = new Vector2i(x, y); oldPos = new Vector2i(x, y);
InGameState.getMap().setPos(this, x, y); InGameState.getMap().setPos(this, x, y);
} }
/** /**