v1.2.0: fixed some minor source merging issues
This commit is contained in:
@@ -83,7 +83,7 @@ public class SupporterScene extends PixelScene {
|
|||||||
link += "?utm_source=shatteredpd";
|
link += "?utm_source=shatteredpd";
|
||||||
link += "&utm_medium=supporter_page";
|
link += "&utm_medium=supporter_page";
|
||||||
link += "&utm_campaign=ingame_link";
|
link += "&utm_campaign=ingame_link";
|
||||||
DeviceCompat.openURI(link);
|
ShatteredPixelDungeon.platform.openURI(link);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
link.icon(Icons.get(Icons.GOLD));
|
link.icon(Icons.get(Icons.GOLD));
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ public class MenuPane extends Component {
|
|||||||
protected void createChildren() {
|
protected void createChildren() {
|
||||||
super.createChildren();
|
super.createChildren();
|
||||||
|
|
||||||
bg = new Image( Assets.Interfaces.MENU, 2, 2, 13, 11 );
|
bg = new Image( Assets.Interfaces.MENU_BTN, 2, 2, 13, 11 );
|
||||||
add( bg );
|
add( bg );
|
||||||
|
|
||||||
journalIcon = new Image( Assets.Interfaces.MENU_BTN, 31, 0, 11, 7);
|
journalIcon = new Image( Assets.Interfaces.MENU_BTN, 31, 0, 11, 7);
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
package com.shatteredpixel.shatteredpixeldungeon.windows;
|
package com.shatteredpixel.shatteredpixeldungeon.windows;
|
||||||
|
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
|
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
|
||||||
|
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
|
import com.shatteredpixel.shatteredpixeldungeon.messages.Languages;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
|
||||||
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
|
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
|
||||||
@@ -66,7 +67,7 @@ public class WndSupportPrompt extends Window {
|
|||||||
link += "?utm_source=shatteredpd";
|
link += "?utm_source=shatteredpd";
|
||||||
link += "&utm_medium=supporter_prompt";
|
link += "&utm_medium=supporter_prompt";
|
||||||
link += "&utm_campaign=ingame_link";
|
link += "&utm_campaign=ingame_link";
|
||||||
DeviceCompat.openURI(link);
|
ShatteredPixelDungeon.platform.openURI(link);
|
||||||
SPDSettings.supportNagged(true);
|
SPDSettings.supportNagged(true);
|
||||||
WndSupportPrompt.super.hide();
|
WndSupportPrompt.super.hide();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user