From b2358cdc71b3754473d1c4b1c4ca54ec47beb96c Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 8 Feb 2018 08:29:42 -0500 Subject: [PATCH] scripts: disable callbacks The method we are hooking to in the VM got inlined.. --- .../scripts/OptionsPanelRebuilder.rs2asm | 8 ++++---- .../scripts/OptionsPanelZoomMouseListener.rs2asm | 16 ++++++++-------- .../scripts/OptionsPanelZoomUpdater.rs2asm | 16 ++++++++-------- .../scripts/ScrollWheelZoomHandler.rs2asm | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm b/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm index 9b6b1458e7..7118cb5faa 100644 --- a/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm +++ b/runelite-scripts/scripts/OptionsPanelRebuilder.rs2asm @@ -230,8 +230,8 @@ LABEL198: 6202 get_varc 73 load_int 195 - load_string "fixedOuterZoomLimit" - runelite_callback + ;load_string "fixedOuterZoomLimit" + ;runelite_callback if_icmpge LABEL210 jump LABEL226 LABEL210: @@ -242,8 +242,8 @@ LABEL210: LABEL214: get_varc 74 load_int 175 - load_string "resizableOuterZoomLimit" - runelite_callback + ;load_string "resizableOuterZoomLimit" + ;runelite_callback if_icmpge LABEL218 jump LABEL226 LABEL218: diff --git a/runelite-scripts/scripts/OptionsPanelZoomMouseListener.rs2asm b/runelite-scripts/scripts/OptionsPanelZoomMouseListener.rs2asm index b5c6874084..56e7a39a54 100644 --- a/runelite-scripts/scripts/OptionsPanelZoomMouseListener.rs2asm +++ b/runelite-scripts/scripts/OptionsPanelZoomMouseListener.rs2asm @@ -34,14 +34,14 @@ LABEL5: istore 2 load_int 715 load_int 175 - load_string "resizableOuterZoomLimit" - runelite_callback + ;load_string "resizableOuterZoomLimit" + ;runelite_callback isub istore 6 load_int 700 load_int 195 - load_string "fixedOuterZoomLimit" - runelite_callback + ;load_string "fixedOuterZoomLimit" + ;runelite_callback isub istore 7 iload 2 @@ -50,8 +50,8 @@ LABEL5: iload 5 idiv load_int 175 - load_string "resizableOuterZoomLimit" - runelite_callback + ;load_string "resizableOuterZoomLimit" + ;runelite_callback iadd istore 3 iload 2 @@ -60,8 +60,8 @@ LABEL5: iload 5 idiv load_int 195 - load_string "fixedOuterZoomLimit" - runelite_callback + ;load_string "fixedOuterZoomLimit" + ;runelite_callback iadd istore 4 iload 4 diff --git a/runelite-scripts/scripts/OptionsPanelZoomUpdater.rs2asm b/runelite-scripts/scripts/OptionsPanelZoomUpdater.rs2asm index 2d4fead69d..9d51461284 100644 --- a/runelite-scripts/scripts/OptionsPanelZoomUpdater.rs2asm +++ b/runelite-scripts/scripts/OptionsPanelZoomUpdater.rs2asm @@ -5,14 +5,14 @@ .string_var_count 0 load_int 715 load_int 175 - load_string "resizableOuterZoomLimit" - runelite_callback + ;load_string "resizableOuterZoomLimit" + ;runelite_callback isub istore 0 load_int 700 load_int 195 - load_string "fixedOuterZoomLimit" - runelite_callback + ;load_string "fixedOuterZoomLimit" + ;runelite_callback isub istore 1 load_int 17104904 @@ -37,8 +37,8 @@ LABEL27: get_varc 74 load_int 175 - load_string "resizableOuterZoomLimit" - runelite_callback + ;load_string "resizableOuterZoomLimit" + ;runelite_callback isub iload 2 imul @@ -49,8 +49,8 @@ LABEL27: LABEL36: get_varc 73 load_int 195 - load_string "fixedOuterZoomLimit" - runelite_callback + ;load_string "fixedOuterZoomLimit" + ;runelite_callback isub iload 2 imul diff --git a/runelite-scripts/scripts/ScrollWheelZoomHandler.rs2asm b/runelite-scripts/scripts/ScrollWheelZoomHandler.rs2asm index 15c4098b3c..87e1d0d000 100644 --- a/runelite-scripts/scripts/ScrollWheelZoomHandler.rs2asm +++ b/runelite-scripts/scripts/ScrollWheelZoomHandler.rs2asm @@ -15,8 +15,8 @@ LABEL5: invoke 1046 istore 0 load_int 195 - load_string "fixedOuterZoomLimit" - runelite_callback + ;load_string "fixedOuterZoomLimit" + ;runelite_callback iload 0 invoke 1045 istore 0 @@ -25,8 +25,8 @@ LABEL5: invoke 1046 istore 1 load_int 175 - load_string "resizableOuterZoomLimit" - runelite_callback + ;load_string "resizableOuterZoomLimit" + ;runelite_callback iload 1 invoke 1045 istore 1