Jan Ehehalt 6 years ago
parent e015e568da
commit a47af21672

@ -904,8 +904,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
//if(button == Input.Buttons.LEFT){ //if(button == Input.Buttons.LEFT){
switch(click(screenX, screenY)){ switch(click(screenX, screenY)){
case -1: // -1: nothing hit -- 0: go ingame -- 1: EXIT game -- 2: goto settings -- 3: goto controls -- 4: goto MainMenuScreen -- 9: volume down -- 10: volume up -- 11: restart game case -1: // -1: nothing hit -- 0: go ingame -- 1: EXIT game -- 2: goto settings -- 3: goto controls -- 4: goto MainMenuScreen -- 9: volume down -- 10: volume up -- 11: restart game
break;
return true;
case 0: case 0:
mm.cleanUp(); mm.cleanUp();
mm = null; mm = null;
@ -913,19 +912,19 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
gs.generateEntitySprites(d.getCurrentEntities()); gs.generateEntitySprites(d.getCurrentEntities());
hc = new HudContainer(); hc = new HudContainer();
gs.startLoadingScreen(); gs.startLoadingScreen();
return true; break;
case 1: case 1:
mm.cleanUp(); mm.cleanUp();
mm = null; mm = null;
gs = new GameScreen(d, volume); gs = new GameScreen(d, volume);
return true; break;
case 2: case 2:
mm.hide(); mm.hide();
cs = null; cs = null;
ss = new SettingsScreen(); ss = new SettingsScreen();
return true; break;
case 3: case 3:
if(mm != null){ if(mm != null){
@ -933,22 +932,22 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
} }
ss = null; ss = null;
cs = new ControlsScreen(); cs = new ControlsScreen();
return true; break;
case 4: case 4:
ss = null; ss = null;
cs = null; cs = null;
mm.show(); mm.show();
return true; break;
case 5: case 5:
resume(); resume();
return true; break;
case 6: case 6:
d.getPlayer().setSkin(mm.getSkin()); d.getPlayer().setSkin(mm.getSkin());
d.getPlayer().setGender(mm.getGender()); d.getPlayer().setGender(mm.getGender());
return true; break;
case 9: case 9:
@ -961,7 +960,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(gs != null){ if(gs != null){
gs.music.setVolume(volume); gs.music.setVolume(volume);
} }
return true; break;
case 10: case 10:
if(volume < 1f){ if(volume < 1f){
volume += 0.05f; volume += 0.05f;
@ -973,10 +972,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
if(gs != null){ if(gs != null){
gs.music.setVolume(volume); gs.music.setVolume(volume);
} }
return true; break;
case 11: case 11:
create(); create();
return true; break;
} }
if(gs == null){ if(gs == null){
@ -986,7 +985,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
gs.generateEntitySprites(d.getCurrentEntities()); gs.generateEntitySprites(d.getCurrentEntities());
hc = new HudContainer(); hc = new HudContainer();
gs.startLoadingScreen(); gs.startLoadingScreen();
return true;
} }
else if(gs != null && gs.getIsLoading() == false) { else if(gs != null && gs.getIsLoading() == false) {
if (screenX < 0.5 * Gdx.graphics.getWidth()) { if (screenX < 0.5 * Gdx.graphics.getWidth()) {
@ -996,8 +994,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
d.getPlayer().setMovementX(d.getPlayer().getMovementSpeed()); d.getPlayer().setMovementX(d.getPlayer().getMovementSpeed());
} }
} }
return true;
}
//} //}
return true; return true;
} }

Loading…
Cancel
Save