Merge remote-tracking branch 'upstream/master' into maven-plugin-upgrades

This commit is contained in:
William Collishaw
2019-05-28 13:00:13 -06:00
11 changed files with 167 additions and 6 deletions

View File

@@ -533,6 +533,7 @@ public class WidgetID
static final int SPELL_ICON = 27;
static final int SPELL_TEXT = 28;
static final int AUTO_RETALIATE = 29;
static final int SPEC_BAR = 34;
}
static class VolcanicMine

View File

@@ -313,6 +313,7 @@ public enum WidgetInfo
COMBAT_SPELL_ICON(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPELL_ICON),
COMBAT_SPELL_TEXT(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPELL_TEXT),
COMBAT_AUTO_RETALIATE(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.AUTO_RETALIATE),
COMBAT_SPEC_BAR(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPEC_BAR), // Used by CombatInterfaceSP.rs2asm
DIALOG_OPTION(WidgetID.DIALOG_OPTION_GROUP_ID, 0),