Source Release: standardized some things between open source and closed source.

This commit is contained in:
Evan Debenham 2015-03-02 19:36:09 -05:00
parent aa303d798b
commit 5325268220
13 changed files with 25 additions and 26 deletions

View File

@ -186,5 +186,5 @@ public class Bones {
return null; return null;
} }
} }
} }
} }

View File

@ -202,7 +202,6 @@ public class StartScene extends PixelScene {
unlock = new Group(); unlock = new Group();
add( unlock ); add( unlock );
if (!(huntressUnlocked = Badges.isUnlocked( Badges.Badge.BOSS_SLAIN_3 ))) { if (!(huntressUnlocked = Badges.isUnlocked( Badges.Badge.BOSS_SLAIN_3 ))) {
BitmapTextMultiline text = PixelScene.createMultiline( TXT_UNLOCK, 9 ); BitmapTextMultiline text = PixelScene.createMultiline( TXT_UNLOCK, 9 );

View File

@ -47,15 +47,15 @@ public class ItemSpriteSheet {
public static final int BONES = ROW1+4; public static final int BONES = ROW1+4;
public static final int REMAINS = ROW1+5; public static final int REMAINS = ROW1+5;
public static final int TOMB = ROW1+6; public static final int TOMB = ROW1+6;
public static final int GRAVE = ROW1+7; public static final int GRAVE = ROW1+7;
public static final int CHEST = ROW1+8; public static final int CHEST = ROW1+8;
public static final int LOCKED_CHEST = ROW1+9; public static final int LOCKED_CHEST = ROW1+9;
public static final int CRYSTAL_CHEST = ROW1+10; public static final int CRYSTAL_CHEST = ROW1+10;
// Placeholders // Placeholders
public static final int WEAPON = ROW1+11; public static final int WEAPON = ROW1+11;
public static final int ARMOR = ROW1+12; public static final int ARMOR = ROW1+12;
public static final int RING = ROW1+13; public static final int RING = ROW1+13;
public static final int SMTH = ROW1+14; public static final int SMTH = ROW1+14;
//Row Two: Miscellaneous single use items //Row Two: Miscellaneous single use items
public static final int GOLD = ROW2+0; public static final int GOLD = ROW2+0;

View File

@ -27,7 +27,7 @@ package com.shatteredpixel.shatteredpixeldungeon.ui;
public class ExitButton extends Button { public class ExitButton extends Button {
private Image image; protected Image image;
public ExitButton() { public ExitButton() {
super(); super();