original game? (reverted from commit 3fc6c98ea5)

Fixed overwrited code
This commit is contained in:
jancoow
2015-06-02 10:22:52 +02:00
parent 3fc6c98ea5
commit df207836e0
21 changed files with 647 additions and 363 deletions
-5
View File
@@ -1,5 +0,0 @@
package control;
public class Button {
}
+2
View File
@@ -5,6 +5,7 @@ import java.util.List;
import model.gameState.GameState;
import model.gameState.MenuState;
import model.gameState.TitleState;
import model.gameState.PlayState;
public class GameStateManager {
@@ -15,6 +16,7 @@ public class GameStateManager {
public GameStateManager(){
gamestates = new ArrayList<GameState>();
gamestates.add(new TitleState(this));
gamestates.add(new MenuState(this));
gamestates.add(new PlayState(this));
currentState = gamestates.get(0);
-5
View File
@@ -1,5 +0,0 @@
package control;
public class JoyStick {
}
+1 -1
View File
@@ -42,7 +42,7 @@ public class ButtonHandler implements KeyListener{
{
b.setColor(new Color((int)(Math.random()*254+1),(int)(Math.random()*254+1),(int)(Math.random()*254+1)));
}
// System.out.println(Window.ON_RASP);
System.out.println(Window.ON_RASP);
if (Window.ON_RASP)
addGpioListeners();