konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merging Source v1.7.2: scene changes

Browse Source
This commit is contained in:
Evan Debenham
2014-10-18 04:56:57 -04:00
parent c976144fdf
commit 9f9e117c95
12 changed files with 482 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java
+11 -6
View File
@@ -17,7 +17,6 @@
*/
package com.shatteredpixel.shatteredpixeldungeon.scenes;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.watabou.noosa.BitmapText;
import com.watabou.noosa.Camera;
import com.watabou.noosa.Game;
@@ -26,9 +25,11 @@ import com.watabou.noosa.audio.Music;
import com.watabou.noosa.audio.Sample;
import com.watabou.noosa.ui.Button;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.effects.BannerSprites;
import com.shatteredpixel.shatteredpixeldungeon.effects.Fireball;
import com.shatteredpixel.shatteredpixeldungeon.ui.Archs;
import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton;
import com.shatteredpixel.shatteredpixeldungeon.ui.PrefsButton;
public class TitleScene extends PixelScene {
@@ -80,7 +81,7 @@ public class TitleScene extends PixelScene {
DashboardItem btnBadges = new DashboardItem( TXT_BADGES, 3 ) {
@Override
protected void onClick() {
Game.switchScene( BadgesScene.class );
ShatteredPixelDungeon.switchNoFade( BadgesScene.class );
}
};
btnBadges.setPos( w / 2 - btnBadges.width(), (h + height) / 2 - DashboardItem.SIZE );
@@ -89,7 +90,7 @@ public class TitleScene extends PixelScene {
DashboardItem btnAbout = new DashboardItem( TXT_ABOUT, 1 ) {
@Override
protected void onClick() {
Game.switchScene( AboutScene.class );
ShatteredPixelDungeon.switchNoFade( AboutScene.class );
}
};
btnAbout.setPos( w / 2, (h + height) / 2 - DashboardItem.SIZE );
@@ -98,7 +99,7 @@ public class TitleScene extends PixelScene {
DashboardItem btnPlay = new DashboardItem( TXT_PLAY, 0 ) {
@Override
protected void onClick() {
Game.switchScene( StartScene.class );
ShatteredPixelDungeon.switchNoFade( StartScene.class );
}
};
btnPlay.setPos( w / 2 - btnPlay.width(), btnAbout.top() - DashboardItem.SIZE );
@@ -107,7 +108,7 @@ public class TitleScene extends PixelScene {
DashboardItem btnHighscores = new DashboardItem( TXT_HIGHSCORES, 2 ) {
@Override
protected void onClick() {
Game.switchScene( RankingsScene.class );
ShatteredPixelDungeon.switchNoFade( RankingsScene.class );
}
};
btnHighscores.setPos( w / 2, btnPlay.top() );
@@ -128,8 +129,12 @@ public class TitleScene extends PixelScene {
add( version );
PrefsButton btnPrefs = new PrefsButton();
btnPrefs.setPos( w - btnPrefs.width() - 1, 1 );
btnPrefs.setPos( 0, 0 );
add( btnPrefs );
ExitButton btnExit = new ExitButton();
btnExit.setPos( w - btnExit.width(), 0 );
add( btnExit );
fadeIn();
}