Merge-Fix Nr. 2

master
Zocker1999NET 8 years ago
parent 53ad8f0c34
commit 098549a3ec

@ -146,5 +146,6 @@ public class Map_World extends GeneralMap
p.setOwner(dataL[(i-1)*2]); p.setOwner(dataL[(i-1)*2]);
p.setEntityCount(dataL[(i*2)-1]); p.setEntityCount(dataL[(i*2)-1]);
} }
redrawPlayers();
} }
} }

@ -12,9 +12,9 @@ public class Start_Load extends World implements ButtonEvent
// Light Theme: "backgroundLight.png" // Light Theme: "backgroundLight.png"
// Dark Theme: "backgroundDark.png" // Dark Theme: "backgroundDark.png"
Button chulien; Button chulien = new Button("Neues Spiel", 16 , this);
Button spielanleitung; Button spielanleitung = new Button("Spielanleitung", 16, this);
Button zurück; Button zurück = new Button("zurück", 16, this);
/** /**
* Constructor for objects of class Start_Load. * Constructor for objects of class Start_Load.
* *
@ -23,9 +23,6 @@ public class Start_Load extends World implements ButtonEvent
{ {
// Create a new world with 600x400 cells with a cell size of 1x1 pixels. // Create a new world with 600x400 cells with a cell size of 1x1 pixels.
super(1600, 900, 1); super(1600, 900, 1);
chulien = new Button("Neues Spiel", 16 , this);
spielanleitung = new Button("Spielanleitung", 16, this);
zurück = new Button("zurück", 16, this);
setBackground(backgroundImage); setBackground(backgroundImage);
chulien.setSize(100,50); chulien.setSize(100,50);
spielanleitung.setSize(100,50); spielanleitung.setSize(100,50);
@ -33,6 +30,8 @@ public class Start_Load extends World implements ButtonEvent
addObject (chulien, (1600-chulien.getWidth())/2+100, (900-chulien.getHeight())/2); addObject (chulien, (1600-chulien.getWidth())/2+100, (900-chulien.getHeight())/2);
addObject (spielanleitung, (1600-spielanleitung.getWidth())/2+100, (900-spielanleitung.getHeight())/2 + 80); addObject (spielanleitung, (1600-spielanleitung.getWidth())/2+100, (900-spielanleitung.getHeight())/2 + 80);
Greenfoot.setSpeed(100);
Greenfoot.start();
} }
public void buttonClicked ( Bildbutton b) public void buttonClicked ( Bildbutton b)
{ {
@ -62,4 +61,3 @@ public class Start_Load extends World implements ButtonEvent
} }
} }

Loading…
Cancel
Save