Merge branch 'master' of ssh://villavu.com:54367/simba

Doc/sphinx/mmlref/ocr.rst

@@ -1,3 +1,5 @@
+.. _mmlref-ocr:
+
 TMOCR Class
 ===========
 
@@ -6,6 +8,8 @@ useful functions that can be used to create and identify text. It also contains
 some functions used in special cases to filter noise. Specifically, these are
 all the ``Filter*`` functions.
 
+.. _uptext-filter:
+
 Uptext
 ------
 

Doc/sphinx/referencescript.rst

@@ -21,4 +21,4 @@ default (Pascal) engine.
     scriptref/bitmaps.rst
     scriptref/string.rst
     scriptref/tpa.rst
-    scriptref/ocr.rst
+

Doc/sphinx/scriptref/bitmaps.rst

@@ -1,5 +1,5 @@
 
-.. _scriptref_bitmaps:
+.. _scriptref-bitmaps:
 
 Bitmaps
 =======

Doc/sphinx/scriptref/colourfinding.rst

@@ -83,7 +83,7 @@ GetColors
 
     function GetColors(const Coords : TPointArray) : TIntegerArray;
 
-GetColor returns the color on the coordinate (x, y) defined by *Coords*.
+GetColors returns an array of the colours at the given *Coords*.
 
 
 CountColor

Doc/sphinx/scriptref/ocr.rst

@@ -80,7 +80,7 @@ BitmapFromText
 
 This function creates a bitmap from a string *text* with the given *font*.
 For an explanation on how to use and work with Bitmaps, please refer to 
-:ref:`scriptref_bitmaps`.
+:ref:`scriptref-bitmaps`.
 
 TPAFromText
 ~~~~~~~~~~~
@@ -91,7 +91,7 @@ TPAFromText
 
 This function creates a TPA from a string *text* with the given *font*.
 For an explanation on how to use and work with TPAs, please refer to 
-:ref:`scriptref_tpointarray`.
+:ref:`scriptref-tpointarray`.
 
 TPAFromTextWrap
 ~~~~~~~~~~~~~~~
@@ -112,7 +112,7 @@ MaskFromText
 
 This function creates a Mask from a string *text* with the given *font*.
 For an explanation on how to use and work with TPAs, please refer to 
-:ref:`scriptref_masks`.
+:ref:`scriptref-masks`.
 
 Reading Text
 ------------
@@ -127,6 +127,8 @@ rs_GetUpText
 This function is a function specific to RuneScape(tm); it reads the text 
 in the upper left corner into a string.
 
+How these functions actually work can be found here: :ref:`uptext-filter`.
+
 rs_GetUpTextAt
 ~~~~~~~~~~~~~~
 

Projects/Simba/simbaunit.pas

@@ -45,7 +45,7 @@ uses
   CastaliaSimplePasPar, v_AutoCompleteForm, PSDump, settings, updater;
 
 const
-  SimbaVersion = 715;
+  SimbaVersion = 720;
 
   interp_PS = 0; //PascalScript
   interp_RT = 1; //RUTIS

Units/MMLCore/libloader.pas

@@ -23,6 +23,7 @@ interface
         procedure FreePlugins;
         procedure LoadPluginsDir(DirIndex : integer);
         function VerifyPath(Path : string) : string;
+        function LoadPluginNoFallback(PluginName : string) : integer;
       protected
         function InitPlugin(plugin: TLibHandle): boolean; virtual; abstract;
       public
@@ -113,8 +114,7 @@ implementation
     end;
   end;
 
-
-  function TGenericLoader.LoadPlugin(PluginName: string): Integer;
+  function TGenericLoader.LoadPluginNoFallback(PluginName: string): Integer;
   var
     i, ii : integer;
     PlugExt: String = {$IFDEF LINUX}'.so';{$ELSE}'.dll';{$ENDIF}
@@ -151,6 +151,19 @@ implementation
   end;
 
 
+  function TGenericLoader.LoadPlugin(PluginName: string): Integer;
+  var
+    CpuBits: String = {$IFDEF CPU32}'32';{$ELSE}'64';{$ENDIF}
+  begin
+    try
+      Result := LoadPluginNoFallback(PluginName);
+    except
+      on exception do Result:= LoadPluginNoFallback(PluginName+CpuBits);
+    end;
+
+  end;
+
+
   constructor TGenericLoader.Create;
   begin
     inherited Create;