diff --git a/Plugins/Embedded_SMART.dll b/Plugins/libsmart.dll old mode 100755 new mode 100644 similarity index 100% rename from Plugins/Embedded_SMART.dll rename to Plugins/libsmart.dll diff --git a/Tests/PS/plugintest.txt b/Tests/PS/plugintest.txt new file mode 100644 index 0000000..26b482b --- /dev/null +++ b/Tests/PS/plugintest.txt @@ -0,0 +1,9 @@ +program new; + +{.LoadDLL libsmart} + + +begin + SmartSetup('http://world19.runescape.com/', 'plugin.js?param=o0,a1,m0', 765, 503); + Wait(5000); +end. \ No newline at end of file diff --git a/Units/MMLAddon/PSInc/psdefines.inc b/Units/MMLAddon/PSInc/psdefines.inc index daf66b8..33af502 100644 --- a/Units/MMLAddon/PSInc/psdefines.inc +++ b/Units/MMLAddon/PSInc/psdefines.inc @@ -1,14 +1,14 @@ -{$IFDEF CPU386 } -PSScript.Defines.Add ('CPU386'); -{$ENDIF } -PSScript.Defines.Add ('MUFASA'); -PSScript.Defines.Add ('COGAT'); -PSScript.Defines.Add ('RAYMONDPOWNS'); -{$IFDEF MSWINDOWS } -PSScript.Defines.Add ('MSWINDOWS'); -PSScript.Defines.Add ('WIN32'); -PSScript.Defines.Add ('WINDOWS'); -{$ENDIF } -{$IFDEF LINUX } -PSScript.Defines.Add ('LINUX'); -{$ENDIF } +{$IFDEF CPU386 } +PSScript.Defines.Add('CPU386'); +{$ENDIF } +PSScript.Defines.Add('MUFASA'); +PSScript.Defines.Add('COGAT'); +PSScript.Defines.Add('RAYMONDPOWNS'); +{$IFDEF MSWINDOWS } +PSScript.Defines.Add('MSWINDOWS'); +PSScript.Defines.Add('WIN32'); +PSScript.Defines.Add('WINDOWS'); +{$ENDIF } +{$IFDEF LINUX } +PSScript.Defines.Add('LINUX'); +{$ENDIF } diff --git a/Units/MMLAddon/plugins.pas b/Units/MMLAddon/plugins.pas index 5f914a3..3c487b0 100644 --- a/Units/MMLAddon/plugins.pas +++ b/Units/MMLAddon/plugins.pas @@ -124,7 +124,9 @@ var PlugExt: String = {$IFDEF LINUX}'.so';{$ELSE}'.dll';{$ENDIF} begin ii := -1; - Result := -1; + result := -1; + if PluginDirs.Count = 0 then + Exit; ValidateDirs; PluginName := ExtractFileNameWithoutExt(PluginName); for i := 0 to PluginDirs.Count - 1 do @@ -134,6 +136,8 @@ begin Raise Exception.CreateFmt('Plugin(%s) has been found multiple times',[PluginName]); ii := i; end; + if ii = -1 then + raise Exception.CreateFMT('Plugins(%s) has not been found',[PluginName]); for i := 0 to PluginLen - 1 do if Plugins[i].filename = (PluginDirs.Strings[ii] + PluginName + PlugExt) then Exit(i);