From 9d0a84b7ae5048bf86a5981351a6ee9b27e95d29 Mon Sep 17 00:00:00 2001
From: yugecin <yugecin@users.noreply.github.com>
Date: Thu, 22 Jun 2017 12:20:25 +0200
Subject: [PATCH] fix expanding cursor while in game

---
 src/itdelatrisu/opsu/Utils.java       | 17 ++++++++---------
 src/itdelatrisu/opsu/states/Game.java | 10 +++++-----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/itdelatrisu/opsu/Utils.java b/src/itdelatrisu/opsu/Utils.java
index 9f757eb6..cbebead9 100644
--- a/src/itdelatrisu/opsu/Utils.java
+++ b/src/itdelatrisu/opsu/Utils.java
@@ -41,11 +41,13 @@ import org.json.JSONObject;
 import org.lwjgl.input.Keyboard;
 import org.newdawn.slick.Animation;
 import org.newdawn.slick.Color;
+import org.newdawn.slick.Input;
 import org.newdawn.slick.util.Log;
 
 import com.sun.jna.platform.FileUtils;
 import yugecin.opsudance.core.NotNull;
 import yugecin.opsudance.core.Nullable;
+import yugecin.opsudance.options.Options;
 
 import static yugecin.opsudance.core.errorhandling.ErrorHandler.*;
 import static yugecin.opsudance.core.InstanceContainer.*;
@@ -152,15 +154,12 @@ public class Utils {
 	 * @return true if pressed
 	 */
 	public static boolean isGameKeyPressed() {
-		/*
-		boolean mouseDown = !Options.isMouseDisabled() && (
-				input.isMouseButtonDown(Input.MOUSE_LEFT_BUTTON) ||
-				input.isMouseButtonDown(Input.MOUSE_RIGHT_BUTTON));
-		return (mouseDown ||
-				input.isKeyDown(Options.getGameKeyLeft()) ||
-				input.isKeyDown(Options.getGameKeyRight()));
-				*/
-		return true;
+		return
+			input.isKeyPressed(Options.OPTION_KEY_LEFT.intval) ||
+			input.isKeyPressed(Options.OPTION_KEY_RIGHT.intval) ||
+			(!Options.OPTION_DISABLE_MOUSE_BUTTONS.state && (
+				input.isMousePressed(Input.MOUSE_LEFT_BUTTON) ||
+				input.isMousePressed(Input.MOUSE_RIGHT_BUTTON)));
 	}
 
 
diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index bd0b8bac..cc5d4666 100644
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -707,10 +707,10 @@ public class Game extends ComplexOpsuState {
 			displayContainer.cursor.draw(replayKeyPressed);
 		} else if (GameMod.AUTO.isActive()) {
 			displayContainer.cursor.draw(autoMousePressed);
-			if (OPTION_DANCE_MIRROR.state && GameMod.AUTO.isActive()) {
+			if (OPTION_DANCE_MIRROR.state) {
 				mirrorCursor.draw(autoMousePressed);
 			}
-		} else if (GameMod.AUTOPILOT.isActive()) {
+		} else {
 			displayContainer.cursor.draw(Utils.isGameKeyPressed());
 		}
 
@@ -922,6 +922,8 @@ public class Game extends ComplexOpsuState {
 			}
 		} else if (GameMod.AUTOPILOT.isActive()) {
 			displayContainer.cursor.setCursorPosition(displayContainer.delta, (int) autoMousePosition.x, (int) autoMousePosition.y);
+		} else {
+			displayContainer.cursor.setCursorPosition(displayContainer.delta, displayContainer.mouseX, displayContainer.mouseY);
 		}
 	}
 
@@ -1444,9 +1446,7 @@ public class Game extends ComplexOpsuState {
 
 		super.enter();
 
-		if (isReplay || GameMod.AUTO.isActive() || GameMod.AUTOPILOT.isActive()) {
-			displayContainer.drawCursor = false;
-		}
+		displayContainer.drawCursor = false;
 
 		isInGame = true;
 		if (!skippedToCheckpoint) {