Feature/json

# Conflicts: # control/GameStateManager.java # image/Images.java # main/Window.java # model/gameState/MenuState.java
2015-06-02 10:51:47 +02:00
parent df207836e0 7b21aa1e09
commit 42ae80b1b3
86 changed files with 1107 additions and 69 deletions
@@ -122,7 +122,10 @@ public class MenuButton {
 	public void setSelected(boolean selected) {
 		this.selected = selected;
 	}
-	
+
+	public boolean isSelected(){
+		return selected;
+	}
 	public void setX(int x){
 		this.x = x;
 		calculateButton();