java-projects/Turrets
1
0
Fork 0
Code

Fix block shooting state

Browse Source
This commit is contained in:
Victor 2014-03-15 18:36:04 +02:00
parent 5e5aeb31e2
commit 6c84c8727b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/annimon/turrets/Turret.java
View File

@ -53,8 +53,7 @@ public class Turret implements Constants {
shootInfo.draw(g);
if (shootInfo.isOver()) {
shootState = false;
}
if (shootInfo.isCollideTerrain(terrain)) {
} else if (shootInfo.isCollideTerrain(terrain)) {
shootState = false;
terrain.destroyTerrain((int) shootInfo.x);
}
@ -85,6 +84,8 @@ public class Turret implements Constants {
}
public void setBarrelParams(int x, int y) {
if (shootState) return;
double angle = Math.atan2(y - turretY, x - turretX);
if (!server) angle = Math.PI - angle;
if ( (0d <= angle) && (angle <= ANGLE_90) ) {
@ -96,6 +97,8 @@ public class Turret implements Constants {
}
public void shoot() {
if (shootState) return;
shootState = true;
shootInfo.reset();
shootInfo.x = barrelX;