From c6ba32075c90c48f0c8fd757fd62462a95a59951 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 8 May 2016 19:17:47 -0400
Subject: [PATCH] adding in changes missed in merge

---
 .../shatteredpixeldungeon/actors/hero/HeroClass.java        | 4 ++--
 .../shatteredpixel/shatteredpixeldungeon/items/Heap.java    | 6 ++----
 .../shatteredpixeldungeon/scenes/RankingsScene.java         | 1 +
 .../shatteredpixeldungeon/windows/WndLangs.java             | 1 +
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
index fb5139279..169cb6de5 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
@@ -108,7 +108,7 @@ public enum HeroClass {
 		Dart darts = new Dart( 8 );
 		darts.identify().collect();
 
-		if ( Badges.global.contains(Badges.Badge.TUTORIAL_WARRIOR) ){
+		if ( Badges.isUnlocked(Badges.Badge.TUTORIAL_WARRIOR) ){
 			if (!Dungeon.isChallenged(Challenges.NO_ARMOR))
 				hero.belongings.armor.affixSeal(new BrokenSeal());
 			Dungeon.quickslot.setSlot(0, darts);
@@ -127,7 +127,7 @@ public enum HeroClass {
 	private static void initMage( Hero hero ) {
 		MagesStaff staff;
 
-		if ( Badges.global.contains(Badges.Badge.TUTORIAL_MAGE) ){
+		if ( Badges.isUnlocked(Badges.Badge.TUTORIAL_MAGE) ){
 			staff = new MagesStaff(new WandOfMagicMissile());
 		} else {
 			staff = new MagesStaff();
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
index c5504794b..1d752ddc8 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java
@@ -49,10 +49,8 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.plants.Plant.Seed;
-import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.shatteredpixel.shatteredpixeldungeon.windows.WndTitledMessage;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundlable;
 import com.watabou.utils.Bundle;
@@ -125,9 +123,9 @@ public class Heap implements Bundlable {
 		case TOMB:
 			Wraith.spawnAround( hero.pos );
 			break;
-		case SKELETON:
 		case REMAINS:
-			CellEmitter.center( pos ).start( Speck.factory( Speck.RATTLE ), 0.1f, 3 );
+		case SKELETON:
+			CellEmitter.center( pos ).start(Speck.factory(Speck.RATTLE), 0.1f, 3);
 			for (Item item : items) {
 				if (item.cursed) {
 					if (Wraith.spawnAt( pos ) == null) {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
index bf1244c73..7deb4a1c2 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/RankingsScene.java
@@ -136,6 +136,7 @@ public class RankingsScene extends PixelScene {
 			noRec.hardlight( 0xCCCCCC );
 			noRec.x = (w - noRec.width()) / 2;
 			noRec.y = (h - noRec.height()) / 2;
+			align(noRec);
 			add(noRec);
 			
 		}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
index d0a3cf703..835ede9ee 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/windows/WndLangs.java
@@ -117,6 +117,7 @@ public class WndLangs extends Window {
 		title.x = textLeft + (textWidth - title.width())/2f;
 		title.y = 0;
 		title.hardlight(TITLE_COLOR);
+		PixelScene.align(title);
 		add(title);
 
 		if (currLang == Languages.ENGLISH){