Skip to content

Commit

Permalink
attack styles: Attach spec bar redraw listener to weapon text
Browse files Browse the repository at this point in the history
This fixes a bug where the special attack bar would not be redrawn if
the combat tab was opened with any weapon equipped which did not have a
special attack bar. The weapon text widget is used because it is always
rendered with the combat tab widgets, and does not already have any kind
of listeners attached.

Fixes runelite#8946
  • Loading branch information
Nightfirecat authored and Adam- committed May 30, 2019
1 parent 5ec52d3 commit 81050f2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,6 @@ static class Combat
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ 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),

Expand Down
4 changes: 2 additions & 2 deletions runelite-client/src/main/scripts/CombatInterfaceSP.rs2asm
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
.string_stack_count 0
.int_var_count 1
.string_var_count 0
; Attach specbar redraw listeners to special attack bar instead of to
; Attach specbar redraw listeners to the weapon name text instead of to
; auto retaliate text (which is var0). Test by enabling "Hide auto retaliate"
; and using a spec.
iconst 38862882 ; 593.34 - spec bar
iconst 38862849 ; 593.1 - weapon name widget
istore 0 ; overwrite script parameter which is the autoretail text
iload 0
invoke 187
Expand Down

0 comments on commit 81050f2

Please sign in to comment.