Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature/json

Browse Source 
# Conflicts:
#	control/GameStateManager.java
#	image/Images.java
#	main/Window.java
#	model/gameState/MenuState.java
This commit is contained in:
jancoow
2015-06-02 10:51:47 +02:00
parent df207836e0 7b21aa1e09
commit 42ae80b1b3
86 changed files with 1107 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/gameState/TitleState.java
+5 -4
View File
@@ -8,9 +8,10 @@ import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import control.joystick.JoystickEvent;
import model.SongHandler;
import control.GameStateManager;
import control.button.ButtonEvent;
import control.joystick.JoystickEvent;
public class TitleState extends GameState {
@@ -23,8 +24,8 @@ public class TitleState extends GameState {
int frame = 0;
int maxFrames = 2560;
public TitleState(GameStateManager gsm) {
super(gsm);
public TitleState(GameStateManager gsm, SongHandler sh){
super(gsm, sh);
}
@Override
public void init() {
@@ -63,7 +64,7 @@ public class TitleState extends GameState {
Font textFont = new Font("OCR A Extended", Font.BOLD, 15);
g2.setFont(textFont);
g2.setColor(Color.WHITE);
g2.drawString("©2015 Team Hamtaro", - 18*5, 500);
g2.drawString("�2015 Team Hamtaro", - 18*5, 500);
}