diff --git a/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java b/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java index 0c4c25d845b23e9ef6270e8f1cdb5b09433d96bb..f84682f2a72f8961471f8bb7ecd2fa0c40d783ad 100644 --- a/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java +++ b/core/src/cz/nic/tablexia/screen/AbstractTablexiaScreen.java @@ -182,7 +182,6 @@ public abstract class AbstractTablexiaScreen<T> extends ScreenAdapter { private static final int MAX_REPLAY_MUSIC = 2; public static final float MUSIC_FADE_OUT_DURATION = 1f; - public static final float AMBIENT_SOUND_VOLUME = 0.5f; private boolean loadingComplete; private boolean loadingStarted; diff --git a/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java b/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java index 395624ed113d9415c46d8a8e357afd2aab9378fc..197390c65b84b56aad685dd3d5e92e43c1198a91 100644 --- a/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java +++ b/core/src/cz/nic/tablexia/screen/createuser/PanoramaScreen.java @@ -86,6 +86,8 @@ public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> { public static final String MUSIC_3 = MFX_PATH + "newspaper/3.mp3"; public static final String MUSIC_4 = MFX_PATH + "newspaper/4.mp3"; + public static final float AMBIENT_SOUND_VOLUME = 0.5f; + private static final String AMBIENT_RESTAURANT = MFX_PATH + "ambient/restaurant.mp3"; private static final String AMBIENT_STREET = MFX_PATH + "ambient/swipe_street.mp3"; diff --git a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java index 38c06d0e5ef7a9d6bfd4256e7705839d75089307..0523c4eafa5f5abe5303ada1fa225b313ed94ed4 100644 --- a/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java +++ b/core/src/cz/nic/tablexia/screen/gamemenu/GameMenuScreen.java @@ -34,8 +34,10 @@ import cz.nic.tablexia.util.Utility; * Edited by Drahomir Karchnak on 2/12/15 */ public class GameMenuScreen extends AbstractTablexiaScreen<int[][]> { + public static final String SCREEN_STATE_PAGE_NUMBER = "pageNumber"; public static final String INTRO_SPEECH = MFX_PATH + "intro.mp3"; + public static final float AMBIENT_SOUND_VOLUME = 0.5f; private Music ambientMusic;