Skip to content

Commit

Permalink
Merge last upd into main | 2-10 game mod | Map selection (3 maps) | C…
Browse files Browse the repository at this point in the history
…leanup code
  • Loading branch information
Lost-Fly committed May 25, 2024
1 parent e362e2c commit eea8ff4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private void processObject(JsonValue object) {
String sessionMsg = object.getString("msg");
String sessionSize = object.getString("size");
String sessionMap = object.getString("map");
Gdx.app.log("SESSION STATE", "MSG " + sessionMsg);

try {
gameSession.setConnected(true);
gameSession.setId(sessionId);
Expand Down
6 changes: 3 additions & 3 deletions core/src/com/aqwsxlostfly/packandgo/Screens/PlayScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public class PlayScreen implements Screen {
public static final String PLAYER_STATE_DELETE = "playerStateDelete";
public static final String FURNITURE_STATE = "furnitureState";
private static final float TOTAL_GAME_TIME_LVL_1 = 6f * 60f;
private static final String PLAYSCREENMUSIC = "Clown.mp3";
private static final String PLAY_SCREEN_MUSIC = "Clown.mp3";
private static final float STEP_TIME = 1 / 60f;
private static final float frameRateRender = 1 / 60f;
private static final float frameRateTimer = 1 / 50f;
Expand Down Expand Up @@ -97,7 +97,7 @@ public PlayScreen() {
hudCamera.position.set((float) screenWidth / 2, (float) screenHeight / 2, 0);
hudCamera.update();

musicTools = new MusicTools(PLAYSCREENMUSIC);
musicTools = new MusicTools(PLAY_SCREEN_MUSIC);
musicTools.startMusic();

screamSound = Gdx.audio.newSound(Gdx.files.internal("scream.mp3"));
Expand Down Expand Up @@ -635,7 +635,7 @@ public void restart() {

Gdx.input.setInputProcessor(inputMultiplexer);

musicTools = new MusicTools(PLAYSCREENMUSIC);
musicTools = new MusicTools(PLAY_SCREEN_MUSIC);
musicTools.startMusic();

resetMap();
Expand Down

0 comments on commit eea8ff4

Please sign in to comment.