Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed enemies and players going off-map

Browse Source
This commit is contained in:
Anuken
2018-01-22 21:40:58 -05:00
parent 6182aae135
commit a85357d5c6
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -186,6 +186,9 @@ public class Player extends SyncEntity{
float angle = Angles.mouseAngle(x, y); float angle = Angles.mouseAngle(x, y);
this.angle = Mathf.lerpAngDelta(this.angle, angle, 0.1f); this.angle = Mathf.lerpAngDelta(this.angle, angle, 0.1f);
} }
x = Mathf.clamp(x, 0, Vars.world.width() * Vars.tilesize);
y = Mathf.clamp(y, 0, Vars.world.height() * Vars.tilesize);
} }
@Override @Override

3
core/src/io/anuke/mindustry/entities/enemies/EnemyType.java
View File

@@ -131,6 +131,9 @@ public class EnemyType {
}else{ }else{
enemy.angle = Mathf.slerp(enemy.angle, enemy.angleTo(enemy.target), turretrotatespeed * Timers.delta()); enemy.angle = Mathf.slerp(enemy.angle, enemy.angleTo(enemy.target), turretrotatespeed * Timers.delta());
} }
enemy.x = Mathf.clamp(enemy.x, 0, Vars.world.width() * Vars.tilesize);
enemy.y = Mathf.clamp(enemy.y, 0, Vars.world.height() * Vars.tilesize);
} }
public void move(Enemy enemy){ public void move(Enemy enemy){