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

v0.6.2a: corrected a few small remaining issues + manifest commit again

Browse Source
This commit is contained in:
Evan Debenham 2017-11-02 00:37:42 -04:00
parent 3a8f148164
commit d7cc01c856
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?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="223" android:versionCode="224"
android:versionName="0.6.2a" android:versionName="0.6.2a"
android:installLocation="auto"> android:installLocation="auto">

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
View File

@ -152,8 +152,11 @@ public class ShatteredPixelDungeon extends Game {
Sample.INSTANCE.enable( soundFx() ); Sample.INSTANCE.enable( soundFx() );
Sample.INSTANCE.volume( SFXVol()/10f ); Sample.INSTANCE.volume( SFXVol()/10f );
TelephonyManager mgr = (TelephonyManager)getSystemService(TELEPHONY_SERVICE); //versions lower than this require READ_PHONE_STATE permission
mgr.listen(Music.callMute, PhoneStateListener.LISTEN_CALL_STATE); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
TelephonyManager mgr = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
mgr.listen(Music.callMute, PhoneStateListener.LISTEN_CALL_STATE);
}
Sample.INSTANCE.load( Sample.INSTANCE.load(
Assets.SND_CLICK, Assets.SND_CLICK,

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CavesLevel.java
View File

@ -174,7 +174,7 @@ public class CavesLevel extends RegularLevel {
@Override @Override
public void update() { public void update() {
if (visible = Dungeon.level.heroFOV[pos]) { if (visible = (pos < Dungeon.level.heroFOV.length && Dungeon.level.heroFOV[pos])) {
super.update(); super.update();

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java
View File

@ -184,7 +184,7 @@ public class CityLevel extends RegularLevel {
@Override @Override
public void update() { public void update() {
if (visible = Dungeon.level.heroFOV[pos]) { if (visible = (pos < Dungeon.level.heroFOV.length && Dungeon.level.heroFOV[pos])) {
super.update(); super.update();
} }
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/HallsLevel.java
View File

@ -181,7 +181,7 @@ public class HallsLevel extends RegularLevel {
@Override @Override
public void update() { public void update() {
if (visible = Dungeon.level.heroFOV[pos]) { if (visible = (pos < Dungeon.level.heroFOV.length && Dungeon.level.heroFOV[pos])) {
super.update(); super.update();

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java
View File

@ -137,7 +137,7 @@ public class ChangesScene extends PixelScene {
changes.addButton( new ChangeButton(Icons.get(Icons.PREFS), Messages.get(this, "misc"), changes.addButton( new ChangeButton(Icons.get(Icons.PREFS), Messages.get(this, "misc"),
"_-_ Improved the formatting of older updates in the changes list. More information will be added to fill these out in future updates.\n\n" + "_-_ Improved the formatting of older updates in the changes list. More information will be added to fill these out in future updates.\n\n" +
"_-_ Slightly reduced the chance for items to appear in locked chests.\n\n" + "_-_ Slightly reduced the chance for items to appear in locked chests.\n\n" +
"_-_ Game music now mutes itself during phone calls")); "_-_ Game music now mutes itself during phone calls on android 6.0+"));
changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(this, "bugfixes"), changes.addButton( new ChangeButton(new Image(Assets.SPINNER, 144, 0, 16, 16), Messages.get(this, "bugfixes"),
"Fixed (caused by 0.6.2):\n" + "Fixed (caused by 0.6.2):\n" +