v0.4.0: fixed a bug involving weapon names

This commit is contained in:
Evan Debenham 2016-06-11 17:16:44 -04:00 committed by Evan Debenham
parent 4972092366
commit e2cc778129
2 changed files with 3 additions and 3 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.shatteredpixel.shatteredpixeldungeon" package="com.shatteredpixel.shatteredpixeldungeon"
android:versionCode="99" android:versionCode="101"
android:versionName="0.4.0-INDEV" android:versionName="0.4.0-BETA-2"
android:installLocation="auto"> android:installLocation="auto">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

View File

@ -229,7 +229,7 @@ abstract public class Weapon extends KindOfWeapon {
@Override @Override
public String name() { public String name() {
return enchantment != null && (cursedKnown || !enchantment.curse()) ? enchantment.name( super.name() ) : super.name; return enchantment != null && (cursedKnown || !enchantment.curse()) ? enchantment.name( super.name() ) : super.name();
} }
@Override @Override