From 098549a3ec14be60e942e4524efde91eaf759099 Mon Sep 17 00:00:00 2001 From: Zocker1999NET Date: Tue, 26 Jul 2016 16:27:56 +0200 Subject: [PATCH] Merge-Fix Nr. 2 --- Map_World.java | 1 + Start_Load.java | 12 +++++------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Map_World.java b/Map_World.java index 04d93c2..ecfe698 100644 --- a/Map_World.java +++ b/Map_World.java @@ -146,5 +146,6 @@ public class Map_World extends GeneralMap p.setOwner(dataL[(i-1)*2]); p.setEntityCount(dataL[(i*2)-1]); } + redrawPlayers(); } } diff --git a/Start_Load.java b/Start_Load.java index fcdd217..0b93ee4 100644 --- a/Start_Load.java +++ b/Start_Load.java @@ -12,9 +12,9 @@ public class Start_Load extends World implements ButtonEvent // Light Theme: "backgroundLight.png" // Dark Theme: "backgroundDark.png" - Button chulien; - Button spielanleitung; - Button zurück; + Button chulien = new Button("Neues Spiel", 16 , this); + Button spielanleitung = new Button("Spielanleitung", 16, this); + Button zurück = new Button("zurück", 16, this); /** * 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. 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); chulien.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 (spielanleitung, (1600-spielanleitung.getWidth())/2+100, (900-spielanleitung.getHeight())/2 + 80); + Greenfoot.setSpeed(100); + Greenfoot.start(); } public void buttonClicked ( Bildbutton b) { @@ -62,4 +61,3 @@ public class Start_Load extends World implements ButtonEvent } } -