LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.3.1: tweaked existing scenes to support new audio functionality

Browse Source
This commit is contained in:
Evan Debenham 2015-07-12 19:22:59 -04:00 committed by Evan Debenham
parent d1d918290a
commit efd506dda7
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -118,6 +118,7 @@ public class ShatteredPixelDungeon extends Game {
Music.INSTANCE.enable( music() );
Sample.INSTANCE.enable( soundFx() );
Sample.INSTANCE.volume( SFXVol()/10f );
Sample.INSTANCE.load(
Assets.SND_CLICK,

4
src/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -133,8 +133,8 @@ public class GameScene extends PixelScene {
public void create() {
Music.INSTANCE.play( Assets.TUNE, true );
Music.INSTANCE.volume( 1f );
Music.INSTANCE.volume( ShatteredPixelDungeon.musicVol()/10f );
ShatteredPixelDungeon.lastClass(Dungeon.hero.heroClass.ordinal());
super.create();

3
src/com/shatteredpixel/shatteredpixeldungeon/scenes/InterlevelScene.java
View File

@ -22,6 +22,7 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
@ -183,7 +184,7 @@ public class InterlevelScene extends PixelScene {
message.alpha( p );
if (mode == Mode.CONTINUE || (mode == Mode.DESCEND && Dungeon.depth == 1)) {
Music.INSTANCE.volume( p );
Music.INSTANCE.volume( p * (ShatteredPixelDungeon.musicVol()/10f));
}
if ((timeLeft -= Game.elapsed) <= 0) {
Game.switchScene( GameScene.class );

4
src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
View File

@ -63,8 +63,8 @@ public class RankingsScene extends PixelScene {
super.create();
Music.INSTANCE.play( Assets.THEME, true );
Music.INSTANCE.volume( 1f );
Music.INSTANCE.volume( ShatteredPixelDungeon.musicVol() / 10f );
uiCamera.visible = false;
int w = Camera.main.width;

3
src/com/shatteredpixel/shatteredpixeldungeon/scenes/SurfaceScene.java
View File

@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes;
import java.nio.FloatBuffer;
import java.util.Calendar;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.watabou.gltextures.Gradient;
import com.watabou.gltextures.SmartTexture;
import com.watabou.glwrap.Matrix;
@ -71,7 +72,7 @@ public class SurfaceScene extends PixelScene {
super.create();
Music.INSTANCE.play( Assets.HAPPY, true );
Music.INSTANCE.volume( 1f );
Music.INSTANCE.volume( ShatteredPixelDungeon.musicVol() / 10f );
uiCamera.visible = false;

4
src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java
View File

@ -64,8 +64,8 @@ public class TitleScene extends PixelScene {
}
Music.INSTANCE.play( Assets.THEME, true );
Music.INSTANCE.volume( 1f );
Music.INSTANCE.volume( ShatteredPixelDungeon.musicVol() / 10f );
uiCamera.visible = false;
int w = Camera.main.width;