From 6d3c333a3fc16e5723d9ad3ad38abf84b416efc5 Mon Sep 17 00:00:00 2001 From: Jeffrey Han Date: Sun, 6 Jul 2014 02:27:53 -0400 Subject: [PATCH] Minor follow-up to d9c251e. - Added 'zip4j' library to ant build script. Other changes: - Added 'esc' hotkey to exit from splash screen. Signed-off-by: Jeffrey Han --- build.xml | 1 + src/itdelatrisu/opsu/states/Splash.java | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/build.xml b/build.xml index c81708e6..a1c5b315 100644 --- a/build.xml +++ b/build.xml @@ -15,6 +15,7 @@ + diff --git a/src/itdelatrisu/opsu/states/Splash.java b/src/itdelatrisu/opsu/states/Splash.java index 524ce444..22ee2dad 100644 --- a/src/itdelatrisu/opsu/states/Splash.java +++ b/src/itdelatrisu/opsu/states/Splash.java @@ -31,6 +31,7 @@ import org.newdawn.slick.Color; import org.newdawn.slick.GameContainer; import org.newdawn.slick.Graphics; import org.newdawn.slick.Image; +import org.newdawn.slick.Input; import org.newdawn.slick.SlickException; import org.newdawn.slick.state.BasicGameState; import org.newdawn.slick.state.StateBasedGame; @@ -53,6 +54,7 @@ public class Splash extends BasicGameState { // game-related variables private int state; + private GameContainer container; private boolean init = false; public Splash(int state) { @@ -62,6 +64,8 @@ public class Splash extends BasicGameState { @Override public void init(GameContainer container, StateBasedGame game) throws SlickException { + this.container = container; + logo = new Image("logo.png"); logo = logo.getScaledCopy((container.getHeight() / 1.2f) / logo.getHeight()); logo.setAlpha(0f); @@ -149,4 +153,13 @@ public class Splash extends BasicGameState { @Override public int getID() { return state; } + + @Override + public void keyPressed(int key, char c) { + if (key == Input.KEY_ESCAPE) { + Options.saveOptions(); + Opsu.closeSocket(); + container.exit(); + } + } }