Land animation progress / IntelliJ android plugin hack
This commit is contained in:
@@ -204,7 +204,6 @@ public class DesktopInput extends InputHandler{
|
||||
panning = false;
|
||||
}
|
||||
|
||||
//TODO awful UI state checking code
|
||||
if(((player.dead() || state.isPaused()) && !ui.chatfrag.shown()) && !scene.hasField() && !scene.hasDialog()){
|
||||
if(input.keyDown(Binding.mouse_move)){
|
||||
panCam = true;
|
||||
@@ -237,7 +236,7 @@ public class DesktopInput extends InputHandler{
|
||||
}
|
||||
}
|
||||
|
||||
if(!player.dead() && !state.isPaused() && !scene.hasField()){
|
||||
if(!player.dead() && !state.isPaused() && !scene.hasField() && !renderer.isCutscene()){
|
||||
updateMovement(player.unit());
|
||||
|
||||
if(Core.input.keyTap(Binding.respawn)){
|
||||
|
||||
@@ -681,7 +681,7 @@ public class MobileInput extends InputHandler implements GestureListener{
|
||||
}
|
||||
}
|
||||
|
||||
if(!player.dead() && !state.isPaused()){
|
||||
if(!player.dead() && !state.isPaused() && !renderer.isCutscene()){
|
||||
updateMovement(player.unit());
|
||||
}
|
||||
|
||||
@@ -822,7 +822,7 @@ public class MobileInput extends InputHandler implements GestureListener{
|
||||
shiftDeltaX %= tilesize;
|
||||
shiftDeltaY %= tilesize;
|
||||
}
|
||||
}else if(!renderer.isLanding()){
|
||||
}else{
|
||||
//pan player
|
||||
Core.camera.position.x -= deltaX;
|
||||
Core.camera.position.y -= deltaY;
|
||||
|
||||
Reference in New Issue
Block a user