Merge pull request #129 from jacz24/dev

Add Verdana fonts to OCR

Author: Torwent

osrs/interfaces/mainscreen/shop.simba

@@ -436,11 +436,3 @@ var
 Global {ref}`TRSShop` variable.
 *)
   Shop: TRSShop;
-
-
-function TRSGameTabs.GetCurrent(): ERSGameTab; override;
-begin
-  Result := inherited;
-  if (Result = ERSGameTab.NONE) and Shop.IsOpen() then
-    Result := ERSGameTab.INVENTORY;
-end;

osrs/overrides.simba

@@ -95,6 +95,8 @@ begin
 
   if Bank.IsOpen() then Exit(ERSGameTab.INVENTORY);
 
+  if Shop.IsOpen() then Exit(ERSGameTab.INVENTORY);
+
   if not HouseOptions.IsOpen() then Exit;
   Result := ERSGameTab.OPTIONS;
   if RSMouseZoom.SettingChecked then Exit;

utils/ocr.simba

@@ -97,6 +97,9 @@ type
     BOLD_SHADOW:    TPixelFont;
     QUILL_8:        TPixelFont;
     QUILL:          TPixelFont;
+    VERDANA_13:     TPixelFont;
+    VERDANA_13_Bold:TPixelFont;
+    VERDANA_15:     TPixelFont;
     Unzipping: Boolean;
     Timeout: TCountDown;
 
@@ -126,6 +129,10 @@ begin
 
   Self.QUILL_8 := OCR.Engine.LoadFont(Self.PATH + 'Quill 8', 4);
   Self.QUILL   := OCR.Engine.LoadFont(Self.PATH + 'Quill', 4);
+
+  Self.VERDANA_13        := OCR.Engine.LoadFont(Self.PATH + 'Verdana 13', 4);
+  Self.VERDANA_13_Bold   := OCR.Engine.LoadFont(Self.PATH + 'Verdana 13 Bold', 4);
+  Self.VERDANA_15        := OCR.Engine.LoadFont(Self.PATH + 'Verdana 15', 4);
 end;
 
 procedure TRSFonts._UnzipFinished(constref result: TASyncUnzipResult);