Hochschulprojekte
/
SpaceScooter
0
0
Fork 0
Code Issues Pull Requests Activity

Actually have the entity take care of adding it to the current screen. Whoopsie.

This commit is contained in:
Jan Philipp Timme 2014-11-04 19:46:19 +01:00
parent e2c34366e3
commit e87ec69e97
5 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/de/teamteamteam/spacescooter/entity/Entity.java
View File

@ -24,6 +24,7 @@ public abstract class Entity implements Updateable, Paintable {
public Entity(int x, int y) {
this.x = x;
this.y = y;
Screen.currentScreen.addEntity(this);
}
public int getX() {

5
src/de/teamteamteam/spacescooter/screen/GameOverScreen.java
View File

@ -28,11 +28,10 @@ public class GameOverScreen extends Screen {
public GameOverScreen(Screen parent) {
super(parent);
this.img = Loader.getBufferedImageByFilename("images/pausebackground.png");
this.entities.add(new Button(GameConfig.windowWidth/2-125, 300));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 400));
new Button(GameConfig.windowWidth/2-125, 300);
new Button(GameConfig.windowWidth/2-125, 400);
player = new Player(GameConfig.windowWidth/2-170, 309);
player.setCanMove(false);
this.entities.add(player);
}
@Override

5
src/de/teamteamteam/spacescooter/screen/GamePausedScreen.java
View File

@ -28,11 +28,10 @@ public class GamePausedScreen extends Screen {
public GamePausedScreen(Screen parent) {
super(parent);
this.img = Loader.getBufferedImageByFilename("images/pausebackground.png");
this.entities.add(new Button(GameConfig.windowWidth/2-125, 300));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 400));
new Button(GameConfig.windowWidth/2-125, 300);
new Button(GameConfig.windowWidth/2-125, 400);
player = new Player(GameConfig.windowWidth/2-170, 309);
player.setCanMove(false);
this.entities.add(player);
}
@Override

12
src/de/teamteamteam/spacescooter/screen/GameScreen.java
View File

@ -26,12 +26,12 @@ public class GameScreen extends Screen {
points.add(new Point(300,300));
points.add(new Point(600,100));
points.add(new Point(0,500));
this.entities.add(new StarBackground(0, 0));
this.entities.add(new Player(200, 300));
this.entities.add(new HealthBar(10, 10));
this.entities.add(new EnemyFour(800, 400, points));
this.entities.add(new EnemyThree(650, 300));
this.entities.add(new EnemyThree(450, 100));
new StarBackground(0, 0);
new Player(200, 300);
new HealthBar(10, 10);
new EnemyFour(800, 400, points);
new EnemyThree(650, 300);
new EnemyThree(450, 100);
}
@Override

13
src/de/teamteamteam/spacescooter/screen/MainMenuScreen.java
View File

@ -27,15 +27,14 @@ public class MainMenuScreen extends Screen {
public MainMenuScreen(Screen parent) {
super(parent);
this.entities.add(new StarBackground(0, 0));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 200));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 275));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 350));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 425));
this.entities.add(new Button(GameConfig.windowWidth/2-125, 500));
new StarBackground(0, 0);
new Button(GameConfig.windowWidth/2-125, 200);
new Button(GameConfig.windowWidth/2-125, 275);
new Button(GameConfig.windowWidth/2-125, 350);
new Button(GameConfig.windowWidth/2-125, 425);
new Button(GameConfig.windowWidth/2-125, 500);
player = new Player(GameConfig.windowWidth/2-170, 209);
player.setCanMove(false);
this.entities.add(player);
}
@Override