Commit 6537ac12 authored by Colin Thomas's avatar Colin Thomas

Merge remote-tracking branch 'origin/master'

parents 1ee43939 1b0cfe70
......@@ -26,8 +26,6 @@ public class GameOverPanel extends MenuPanel {
setTitlePanel("Game Over");
addToCentralColumn(sorryLabel,1,1);
addToCentralColumn(ButtonMaker.makeButton("Return to main menu", returnButtonActionListener),1,1);
GraphicsMasterAbstraction.getInstance().changeGUIStateTo(GraphicsMasterAbstraction.GUIStates.GAME_OVER);
}
private ActionListener returnButtonActionListener = new ActionListener() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment