Land animation progress / IntelliJ android plugin hack

This commit is contained in:
Anuken
2021-07-27 16:26:13 -04:00
parent 269c48b65b
commit 00e3a59463
9 changed files with 61 additions and 31 deletions
+1 -2
View File
@@ -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)){
+2 -2
View File
@@ -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;