Added SQLConnector to states

This commit is contained in:
2015-06-12 13:15:06 +02:00
parent 211bdda4a8
commit b4a223fdd1
7 changed files with 23 additions and 15 deletions
+3 -2
View File
@@ -17,6 +17,7 @@ import control.GameStateManager;
import control.GameStateManager.State;
import control.button.ButtonEvent;
import control.joystick.JoystickEvent;
import data.io.SQLConnector;
public class GameOverState extends GameState {
@@ -29,8 +30,8 @@ public class GameOverState extends GameState {
int frame;
public GameOverState(GameStateManager gsm, SongHandler sh) {
super(gsm, sh);
public GameOverState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
super(gsm, sh, sql);
createBackground();
}
+4 -1
View File
@@ -6,15 +6,18 @@ import model.SongHandler;
import control.GameStateManager;
import control.button.ButtonEvent;
import control.joystick.JoystickEvent;
import data.io.SQLConnector;
public abstract class GameState {
protected GameStateManager gsm;
protected SongHandler sh;
protected SQLConnector sql;
public GameState(GameStateManager gsm, SongHandler sh) {
public GameState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
this.gsm = gsm;
this.sh = sh;
this.sql = sql;
}
public abstract void init();
+3 -2
View File
@@ -30,6 +30,7 @@ import control.button.ButtonEvent;
import control.button.ButtonHandler;
import control.joystick.Joystick;
import control.joystick.JoystickEvent;
import data.io.SQLConnector;
public class MenuState extends GameState {
private ArrayList<MenuButton> buttons;
@@ -58,8 +59,8 @@ public class MenuState extends GameState {
public MenuState(GameStateManager gsm, SongHandler sh) {
super(gsm, sh);
public MenuState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
super(gsm, sh, sql);
buttons = new ArrayList<MenuButton>();
buttons2 = new ArrayList<DifficultyButton>();
this.songs = sh.getSongs();
+3 -2
View File
@@ -21,6 +21,7 @@ import control.button.Button;
import control.button.ButtonEvent;
import control.button.ButtonHandler;
import control.joystick.JoystickEvent;
import data.io.SQLConnector;
public class PlayState extends GameState {
@@ -40,8 +41,8 @@ public class PlayState extends GameState {
private long oldProgress = 0;
public PlayState(GameStateManager gsm, SongHandler sh) {
super(gsm, sh);
public PlayState(GameStateManager gsm, SongHandler sh, SQLConnector sql) {
super(gsm, sh, sql);
infoPanel = new InfoPanel(0, 0, sh);
area = new PlayArea(256, 1024, 1024, 125);
player = new Player(1280 - 1024 + 1024 / 2, 1024 / 2);
+3 -2
View File
@@ -17,6 +17,7 @@ import control.GameStateManager;
import control.GameStateManager.State;
import control.button.ButtonEvent;
import control.joystick.JoystickEvent;
import data.io.SQLConnector;
public class TitleState extends GameState {
@@ -37,8 +38,8 @@ public class TitleState extends GameState {
int indexKast = 0;
int xKast=0;
public TitleState(GameStateManager gsm, SongHandler sh){
super(gsm, sh);
public TitleState(GameStateManager gsm, SongHandler sh, SQLConnector sql){
super(gsm, sh, sql);
createBackground();
}