some interaction fixes

src/itdelatrisu/opsu/states/Game.java

@@ -981,7 +981,7 @@ public class Game extends BasicGameState {
 	@Override
 	public void keyPressed(int key, char c) {
 
-		if (sbOverlay.keyPressed(key)) {
+		if (sbOverlay.keyPressed(key, c)) {
 			return;
 		}
 
@@ -1305,10 +1305,6 @@ public class Game extends BasicGameState {
 //		container.setMouseGrabbed(true);
 
 
-		if (!checkpointLoaded) {
-			sbOverlay.updateIndex(0);
-		}
-
 		// restart the game
 		if (restart != Restart.FALSE) {
 			// load mods
@@ -1450,7 +1446,11 @@ public class Game extends BasicGameState {
 			SoundController.mute(false);
 		}
 
+
 		sbOverlay.setGameObjects(gameObjects);
+		if (!checkpointLoaded) {
+			sbOverlay.updateIndex(0);
+		}
 
 		Pippi.reset();
 		mirrorFrom = 0;

src/yugecin/opsudance/ui/OptionsOverlay.java

@@ -70,8 +70,10 @@ public class OptionsOverlay {
 	private final ItemList list;
 	private GameContainer container;
 	private Options.GameOption selectedOption;
+	private final SBOverlay overlay;
 
-	public OptionsOverlay() {
+	public OptionsOverlay(SBOverlay overlay) {
+		this.overlay = overlay;
 		list = new ItemList();
 	}
 
@@ -176,6 +178,9 @@ public class OptionsOverlay {
 	}
 
 	public boolean mouseReleased(int button, int x, int y) {
+		if (selectedOption != null) {
+			overlay.saveOption(selectedOption, selectedOption.write());
+		}
 		selectedOption = null;
 		if (list.isVisible()) {
 			list.mouseReleased(button, x, y);
@@ -191,4 +196,12 @@ public class OptionsOverlay {
 		}
 		return true;
 	}
+
+	public boolean keyPressed(int key, char c) {
+		if (list.isVisible()) {
+			list.keyPressed(key, c);
+			return true;
+		}
+		return false;
+	}
 }

src/yugecin/opsudance/ui/SBOverlay.java

@@ -17,6 +17,7 @@
  */
 package yugecin.opsudance.ui;
 
+import itdelatrisu.opsu.Options;
 import itdelatrisu.opsu.audio.MusicController;
 import itdelatrisu.opsu.objects.GameObject;
 import itdelatrisu.opsu.states.Game;
@@ -28,7 +29,11 @@ import org.newdawn.slick.Input;
 import org.newdawn.slick.state.StateBasedGame;
 
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
+@SuppressWarnings("unchecked")
 public class SBOverlay {
 
 	public static boolean isActive = true;
@@ -50,7 +55,7 @@ public class SBOverlay {
 
 	public SBOverlay(Game game) {
 		this.game = game;
-		options = new OptionsOverlay();
+		options = new OptionsOverlay(this);
 	}
 
 	public void init(GameContainer container, Input input, int width, int height) {
@@ -84,10 +89,13 @@ public class SBOverlay {
 		}
 	}
 
-	public boolean keyPressed(int key) {
+	public boolean keyPressed(int key, char c) {
 		if (!isActive) {
 			return false;
 		}
+		if (options.keyPressed(key, c)) {
+			return true;
+		}
 		if (key == Input.KEY_C && speed > 0) {
 			speed -= 1;
 			if (speed == 0) {
@@ -137,6 +145,13 @@ public class SBOverlay {
 		this.gameObjects = gameObjects;
 	}
 
+	public void saveOption(Options.GameOption option, String value) {
+		if (optionsMap[index] == null) {
+			optionsMap[index] = new HashMap<>();
+		}
+		optionsMap[index].put(option, value);
+	}
+
 	public boolean mousePressed(int button, int x, int y) {
 		return menu && options.mousePressed(button, x, y);
 	}
@@ -147,6 +162,13 @@ public class SBOverlay {
 
 	public void updateIndex(int index) {
 		this.index = index;
+		HashMap options = optionsMap[index];
+		if (options != null) {
+			for (Object o : options.entrySet()) {
+				Map.Entry<Options.GameOption, String> next = (Map.Entry<Options.GameOption, String>) o;
+				next.getKey().read(next.getValue());
+			}
+		}
 	}
 
 	public boolean mouseReleased(int button, int x, int y) {