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

fixed java 1.5 comp.

Browse source
This commit is contained in:
Ziver Koc 2007-05-06 20:39:36 +00:00
parent c7cd1a15e2
commit f22ec44bab
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -119,7 +119,7 @@ public abstract class Building extends GameEntity{
if(buildQueue.isEmpty()){ if(buildQueue.isEmpty()){
return 0; return 0;
} }
int progress = (int)(((float)buildTime/buildQueue.peekFirst().getBuildTime())*100); int progress = (int)(((float)buildTime/buildQueue.peek().getBuildTime())*100);
if(progress > 100){ if(progress > 100){
progress = 100; progress = 100;
} }
@ -145,38 +145,38 @@ public abstract class Building extends GameEntity{
removeBuilding(); removeBuilding();
} }
if(!buildQueue.isEmpty() && getPlayer().getKredits() >= buildQueue.peekFirst().getPrice()){ if(!buildQueue.isEmpty() && getPlayer().getKredits() >= buildQueue.peek().getPrice()){
if(buildTime == 0){ if(buildTime == 0){
getPlayer().addKredits(-buildQueue.peekFirst().getPrice()); getPlayer().addKredits(-buildQueue.peek().getPrice());
} }
buildTime++; buildTime++;
if(buildTime >= buildQueue.peekFirst().getBuildTime()){ if(buildTime >= buildQueue.peek().getBuildTime()){
if(!unitNode.contains(buildQueue.peekFirst().getNode())){ if(!unitNode.contains(buildQueue.peekFirst().getNode())){
System.out.println(buildQueue.peekFirst().getNode()); System.out.println(buildQueue.peekFirst().getNode());
unitNode.add(buildQueue.peekFirst().getNode(),unitNode.size()/2); 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()); 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.peekFirst().getNode().getLocation().getX()) { if(moveTo.getX() > buildQueue.peek().getNode().getLocation().getX()) {
buildQueue.peekFirst().getNode().getLocation().add(buildQueue.peekFirst().getVelocity(), 0f, 0f); buildQueue.peek().getNode().getLocation().add(buildQueue.peekFirst().getVelocity(), 0f, 0f);
} }
if(moveTo.getX() < buildQueue.peekFirst().getNode().getLocation().getX()) { if(moveTo.getX() < buildQueue.peek().getNode().getLocation().getX()) {
buildQueue.peekFirst().getNode().getLocation().add(-buildQueue.peekFirst().getVelocity(), 0f, 0f); buildQueue.peek().getNode().getLocation().add(-buildQueue.peekFirst().getVelocity(), 0f, 0f);
} }
if(moveTo.getY() > buildQueue.peekFirst().getNode().getLocation().getY()) { if(moveTo.getY() > buildQueue.peek().getNode().getLocation().getY()) {
buildQueue.peekFirst().getNode().getLocation().add(0f, buildQueue.peekFirst().getVelocity(), 0f); buildQueue.peek().getNode().getLocation().add(0f, buildQueue.peek().getVelocity(), 0f);
} }
if(moveTo.getY() < buildQueue.peekFirst().getNode().getLocation().getY()) { if(moveTo.getY() < buildQueue.peek().getNode().getLocation().getY()) {
buildQueue.peekFirst().getNode().getLocation().add(0f, -buildQueue.peekFirst().getVelocity(), 0f); buildQueue.peek().getNode().getLocation().add(0f, -buildQueue.peek().getVelocity(), 0f);
} }
System.out.println(buildQueue.peekFirst().getNode().getLocation()); System.out.println(buildQueue.peek().getNode().getLocation());
if(Math.abs(moveTo.getX() - buildQueue.peekFirst().getNode().getLocation().getX()) < buildQueue.peekFirst().getVelocity()+1 if(Math.abs(moveTo.getX() - buildQueue.peek().getNode().getLocation().getX()) < buildQueue.peek().getVelocity()+1
&& Math.abs(moveTo.getY() - buildQueue.peekFirst().getNode().getLocation().getY())< buildQueue.peekFirst().getVelocity()+1 ){ && Math.abs(moveTo.getY() - buildQueue.peek().getNode().getLocation().getY())< buildQueue.peek().getVelocity()+1 ){
buildTime = 0; buildTime = 0;
unitNode.remove(buildQueue.peekFirst().getNode()); unitNode.remove(buildQueue.peek().getNode());
buildQueue.peekFirst().forcePos(temp.getX(),temp.getY()); buildQueue.peek().forcePos(temp.getX(),temp.getY());
getPlayer().addUnit(buildQueue.poll()); getPlayer().addUnit(buildQueue.poll());
} }
} }