Merged in M4SS/holocore/radials_fix (pull request #307)

NGE-426 - Radial menu for bank terminal is incorrect
This commit is contained in:
Obique PSWG
2016-09-25 19:33:53 -05:00
2 changed files with 8 additions and 3 deletions
+4
View File
@@ -137,6 +137,10 @@ public enum RadialItem {
ITEM_EQUIP_APPEARANCE (""),
ITEM_UNEQUIP_APPEARANCE (""),
OPEN_STORYTELLER_RECIPE (""),
ITEM_WP_MAKE_CITY_WAYPOINT (""),
ITEM_WP_MAKE_GUILD_WAYPOINT (""),
ATMOSPHERIC_FLIGHT_FLY (""),
ATMOSPHERIC_FLIGHT_LAND (""),
SERVER_DIVIDER (""),
SERVER_MENU1 (""),
SERVER_MENU2 (""),
+4 -3
View File
@@ -48,9 +48,10 @@ public class RadialOption {
public void setItem(RadialItem item) { this.item = item; }
public void addChild(RadialOption option) { this.children.add(option); }
public void addChild(RadialItem item) { addChild(new RadialOption(item)); }
public void addChildWithOverriddenText(RadialItem item, String overridenText) {
addChild(item);
setOverriddenText(overriddenText);
public void addChildWithOverriddenText(RadialItem item, String overriddenText) {
RadialOption childOption = new RadialOption(item);
childOption.setOverriddenText(overriddenText);
addChild(childOption);
}
public void setOverriddenText(String overridenText) { this.overriddenText = overridenText; }