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

bugg fix

Browse source
This commit is contained in:
Ziver Koc 2007-05-06 20:44:05 +00:00
parent f22ec44bab
commit ba32196429
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ei/game/scene/Map.java
View file

@ -8,7 +8,6 @@ import java.util.LinkedList;
import ei.engine.math.Vector2f; import ei.engine.math.Vector2f;
import ei.engine.math.Vector2i; import ei.engine.math.Vector2i;
import ei.engine.math.Vector3f; import ei.engine.math.Vector3f;
import ei.engine.scene.Box;
import ei.engine.scene.Entity; import ei.engine.scene.Entity;
import ei.engine.scene.Node; import ei.engine.scene.Node;
import ei.engine.scene.Sprite; import ei.engine.scene.Sprite;

10
src/ei/game/scene/buildings/Building.java
View file

@ -151,19 +151,19 @@ public abstract class Building extends GameEntity{
} }
buildTime++; buildTime++;
if(buildTime >= buildQueue.peek().getBuildTime()){ if(buildTime >= buildQueue.peek().getBuildTime()){
if(!unitNode.contains(buildQueue.peekFirst().getNode())){ if(!unitNode.contains(buildQueue.peek().getNode())){
System.out.println(buildQueue.peekFirst().getNode()); System.out.println(buildQueue.peek().getNode());
unitNode.add(buildQueue.peekFirst().getNode(),unitNode.size()/2); unitNode.add(buildQueue.peek().getNode(),unitNode.size()/2);
buildQueue.peek().getNode().setLocation(moveFrom); buildQueue.peek().getNode().setLocation(moveFrom);
} }
Vector2i temp = Map.getPosByPixel(moveTo.getX(), moveTo.getY()); Vector2i temp = Map.getPosByPixel(moveTo.getX(), moveTo.getY());
if(InGameState.getMap().isPosEmpty(temp.getX(),temp.getY())){ if(InGameState.getMap().isPosEmpty(temp.getX(),temp.getY())){
//The moving is done here. //The moving is done here.
if(moveTo.getX() > buildQueue.peek().getNode().getLocation().getX()) { if(moveTo.getX() > buildQueue.peek().getNode().getLocation().getX()) {
buildQueue.peek().getNode().getLocation().add(buildQueue.peekFirst().getVelocity(), 0f, 0f); buildQueue.peek().getNode().getLocation().add(buildQueue.peek().getVelocity(), 0f, 0f);
} }
if(moveTo.getX() < buildQueue.peek().getNode().getLocation().getX()) { if(moveTo.getX() < buildQueue.peek().getNode().getLocation().getX()) {
buildQueue.peek().getNode().getLocation().add(-buildQueue.peekFirst().getVelocity(), 0f, 0f); buildQueue.peek().getNode().getLocation().add(-buildQueue.peek().getVelocity(), 0f, 0f);
} }
if(moveTo.getY() > buildQueue.peek().getNode().getLocation().getY()) { if(moveTo.getY() > buildQueue.peek().getNode().getLocation().getY()) {
buildQueue.peek().getNode().getLocation().add(0f, buildQueue.peek().getVelocity(), 0f); buildQueue.peek().getNode().getLocation().add(0f, buildQueue.peek().getVelocity(), 0f);