From f22ec44babbbf4d4a64dc6322a8596098827b703 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Sun, 6 May 2007 20:39:36 +0000 Subject: [PATCH] fixed java 1.5 comp. --- src/ei/game/scene/buildings/Building.java | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ei/game/scene/buildings/Building.java b/src/ei/game/scene/buildings/Building.java index 91704f8..49b96f9 100644 --- a/src/ei/game/scene/buildings/Building.java +++ b/src/ei/game/scene/buildings/Building.java @@ -119,7 +119,7 @@ public abstract class Building extends GameEntity{ if(buildQueue.isEmpty()){ return 0; } - int progress = (int)(((float)buildTime/buildQueue.peekFirst().getBuildTime())*100); + int progress = (int)(((float)buildTime/buildQueue.peek().getBuildTime())*100); if(progress > 100){ progress = 100; } @@ -145,38 +145,38 @@ public abstract class Building extends GameEntity{ removeBuilding(); } - if(!buildQueue.isEmpty() && getPlayer().getKredits() >= buildQueue.peekFirst().getPrice()){ + if(!buildQueue.isEmpty() && getPlayer().getKredits() >= buildQueue.peek().getPrice()){ if(buildTime == 0){ - getPlayer().addKredits(-buildQueue.peekFirst().getPrice()); + getPlayer().addKredits(-buildQueue.peek().getPrice()); } buildTime++; - if(buildTime >= buildQueue.peekFirst().getBuildTime()){ + if(buildTime >= buildQueue.peek().getBuildTime()){ if(!unitNode.contains(buildQueue.peekFirst().getNode())){ System.out.println(buildQueue.peekFirst().getNode()); unitNode.add(buildQueue.peekFirst().getNode(),unitNode.size()/2); - buildQueue.peekFirst().getNode().setLocation(moveFrom); + buildQueue.peek().getNode().setLocation(moveFrom); } Vector2i temp = Map.getPosByPixel(moveTo.getX(), moveTo.getY()); if(InGameState.getMap().isPosEmpty(temp.getX(),temp.getY())){ //The moving is done here. - if(moveTo.getX() > buildQueue.peekFirst().getNode().getLocation().getX()) { - buildQueue.peekFirst().getNode().getLocation().add(buildQueue.peekFirst().getVelocity(), 0f, 0f); + if(moveTo.getX() > buildQueue.peek().getNode().getLocation().getX()) { + buildQueue.peek().getNode().getLocation().add(buildQueue.peekFirst().getVelocity(), 0f, 0f); } - if(moveTo.getX() < buildQueue.peekFirst().getNode().getLocation().getX()) { - buildQueue.peekFirst().getNode().getLocation().add(-buildQueue.peekFirst().getVelocity(), 0f, 0f); + if(moveTo.getX() < buildQueue.peek().getNode().getLocation().getX()) { + buildQueue.peek().getNode().getLocation().add(-buildQueue.peekFirst().getVelocity(), 0f, 0f); } - if(moveTo.getY() > buildQueue.peekFirst().getNode().getLocation().getY()) { - buildQueue.peekFirst().getNode().getLocation().add(0f, buildQueue.peekFirst().getVelocity(), 0f); + if(moveTo.getY() > buildQueue.peek().getNode().getLocation().getY()) { + buildQueue.peek().getNode().getLocation().add(0f, buildQueue.peek().getVelocity(), 0f); } - if(moveTo.getY() < buildQueue.peekFirst().getNode().getLocation().getY()) { - buildQueue.peekFirst().getNode().getLocation().add(0f, -buildQueue.peekFirst().getVelocity(), 0f); + if(moveTo.getY() < buildQueue.peek().getNode().getLocation().getY()) { + buildQueue.peek().getNode().getLocation().add(0f, -buildQueue.peek().getVelocity(), 0f); } - System.out.println(buildQueue.peekFirst().getNode().getLocation()); - if(Math.abs(moveTo.getX() - buildQueue.peekFirst().getNode().getLocation().getX()) < buildQueue.peekFirst().getVelocity()+1 - && Math.abs(moveTo.getY() - buildQueue.peekFirst().getNode().getLocation().getY())< buildQueue.peekFirst().getVelocity()+1 ){ + System.out.println(buildQueue.peek().getNode().getLocation()); + if(Math.abs(moveTo.getX() - buildQueue.peek().getNode().getLocation().getX()) < buildQueue.peek().getVelocity()+1 + && Math.abs(moveTo.getY() - buildQueue.peek().getNode().getLocation().getY())< buildQueue.peek().getVelocity()+1 ){ buildTime = 0; - unitNode.remove(buildQueue.peekFirst().getNode()); - buildQueue.peekFirst().forcePos(temp.getX(),temp.getY()); + unitNode.remove(buildQueue.peek().getNode()); + buildQueue.peek().forcePos(temp.getX(),temp.getY()); getPlayer().addUnit(buildQueue.poll()); } }