Fix zoom after update

2018-10-11 19:21:43 +02:00
parent 78cbf47b83
commit dea5efffc2
7 changed files with 31 additions and 84 deletions
--- a/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
@@ -276,28 +276,24 @@ LABEL253:
   6202                  
   get_varc               73
   load_int               128
-   load_string            "fixedOuterZoomLimit"
-   runelite_callback     
   if_icmpge              LABEL262
   jump                   LABEL278
 LABEL262:
   get_varc               73
   load_int               896
-   load_string            "fixedInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   if_icmple              LABEL266
   jump                   LABEL278
 LABEL266:
   get_varc               74
   load_int               128
-   load_string            "resizableOuterZoomLimit"
-   runelite_callback     
   if_icmpge              LABEL270
   jump                   LABEL278
 LABEL270:
   get_varc               74
   load_int               896
-   load_string            "resizableInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   if_icmple              LABEL274
   jump                   LABEL278
--- a/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelZoomMouseListener.rs2asm
@@ -35,19 +35,15 @@ LABEL5:
   invoke                 1046
   istore                 2
   load_int               896
-   load_string            "resizableInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   load_int               128
-   load_string            "resizableOuterZoomLimit"
-   runelite_callback     
   isub                  
   istore                 6 ; resizable delta
   load_int               896
-   load_string            "fixedInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   load_int               128
-   load_string            "fixedOuterZoomLimit"
-   runelite_callback     
   isub                  
   istore                 7 ; fixed delta
   iload                  2
@@ -57,11 +53,9 @@ LABEL5:
   idiv                  
   iload                  6
   load_string            "zoomLinToExp"
-   runelite_callback     
-   pop_int               
+   runelite_callback
+   pop_int
   load_int               128
-   load_string            "resizableOuterZoomLimit"
-   runelite_callback     
   iadd                  
   istore                 3
   iload                  2
@@ -71,11 +65,9 @@ LABEL5:
   idiv                  
   iload                  7
   load_string            "zoomLinToExp"
-   runelite_callback     
-   pop_int               
+   runelite_callback
+   pop_int
   load_int               128
-   load_string            "fixedOuterZoomLimit"
-   runelite_callback     
   iadd                  
   istore                 4
   iload                  4
--- a/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
+++ b/runelite-client/src/main/scripts/OptionsPanelZoomUpdater.rs2asm
@@ -8,19 +8,15 @@
 ; 1 fixedZoomRange
 ; 2 bar size
   load_int               896
-   load_string            "resizableInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   load_int               128
-   load_string            "resizableOuterZoomLimit"
-   runelite_callback     
   isub                  
   istore                 0
   load_int               896
-   load_string            "fixedInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   load_int               128
-   load_string            "fixedOuterZoomLimit"
-   runelite_callback     
   isub                  
   istore                 1
   load_int               17104905
@@ -45,33 +41,29 @@
 LABEL27:
   get_varc               74
   load_int               128
-   load_string            "resizableOuterZoomLimit"
-   runelite_callback     
-   isub                  
-   iload                  2
+   isub
+   iload                  0
   load_string            "zoomExpToLin"
-   runelite_callback     
-   pop_int               
+   runelite_callback
+   pop_int
   iload                  2
   imul                  
   iload                  0
-   idiv                  
+   idiv
   istore                 5
   jump                   LABEL44
 LABEL36:
   get_varc               73
   load_int               128
-   load_string            "fixedOuterZoomLimit"
-   runelite_callback     
-   isub                  
-   iload                  2
+   isub
+   iload                  0
   load_string            "zoomExpToLin"
-   runelite_callback     
-   pop_int               
+   runelite_callback
+   pop_int
   iload                  2
   imul                  
   iload                  1
-   idiv                  
+   idiv
   istore                 5
 LABEL44:
   iload                  5
--- a/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
+++ b/runelite-client/src/main/scripts/ScrollWheelZoomHandler.rs2asm
@@ -3,7 +3,7 @@
 .string_stack_count 0
 .int_var_count      4
 .string_var_count   0
-   load_int               0
+   load_int               1
   load_int               0
   load_string            "scrollWheelZoom"
   runelite_callback     
--- a/runelite-client/src/main/scripts/ZoomHandler.rs2asm
+++ b/runelite-client/src/main/scripts/ZoomHandler.rs2asm
@@ -11,26 +11,22 @@ LABEL4:
   return                
 LABEL5:
   load_int               896
-   load_string            "fixedInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   iload                  0
   invoke                 1046
   istore                 0
   load_int               128
-   load_string            "fixedOuterZoomLimit"
-   runelite_callback     
   iload                  0
   invoke                 1045
   istore                 0
   load_int               896
-   load_string            "resizableInnerZoomLimit"
+   load_string            "innerZoomLimit"
   runelite_callback     
   iload                  1
   invoke                 1046
   istore                 1
   load_int               128
-   load_string            "resizableOuterZoomLimit"
-   runelite_callback     
   iload                  1
   invoke                 1045
   istore                 1