Deleted overloaded function ScriptTransForSSTP

diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas
index b628b28..b9b1652 100755 (executable)
--- a/bottleclient/MainForm.pas
+++ b/bottleclient/MainForm.pas
@@ -343,7 +343,6 @@ type
       Options: TScriptTransOptions): String; overload;
     function DoTrans(var Script: String;
       Options: TScriptTransOptions; out FoundURL: boolean): String; overload;
-    function ScriptTransForSSTP(const Script: String): String; overload;
     function ScriptTransForSSTP(const Script: String;
       out Error: String): String; overload;
     procedure BeginConnect;
@@ -1687,7 +1686,7 @@ procedure TfrmSender.DispatchBottle(EventType: TIdSlppEventType;
   Dat: THeadValue);
 var Opt: TSstpSendOptions;
     Event: TBottleChainBottleEvent;
-    Script, Sender, Ghost, Channel: String;
+    Script, Sender, Ghost, Channel, ErrorMes: String;
     BreakFlag, NoDispatch: boolean;
     Sound, LogName: String;
     i, j, k, SkipCount: integer;
@@ -1722,8 +1721,8 @@ begin
     else Event.LogType := ltSystemLog;
 
     //\83X\83N\83\8a\83v\83g\95Ï\8a·
-    Script := ScriptTransForSSTP(Dat['Script']);
-    if Script = '' then begin
+    Script := ScriptTransForSSTP(Dat['Script'], ErrorMes);
+    if ErrorMes <> '' then begin
       frmLog.AddCurrentSystemLog('SYSTEM', '\96â\91è\82Ì\82 \82é\89Â\94\\90«\82Ì\82 \82é\83X\83N\83\8a\83v\83g\82ª\93Í\82¢\82½\82½\82ß\81A'+
                     '\94z\91\97\82³\82ê\82Ü\82¹\82ñ\82Å\82µ\82½\81@\81c '+Dat['Script']);
       Exit;
@@ -2538,16 +2537,9 @@ begin
   frmLog.lvwLog.Invalidate;
 end;
 
-function TfrmSender.ScriptTransForSSTP(const Script: String): String;
-var dum: String;
-begin
-  Result := ScriptTransForSSTP(Script, dum);
-end;
-
 function TfrmSender.ScriptTransForSSTP(const Script: String;
   out Error: String): String;
 var TransOpt: TScriptTransOptions;
-    Err: String;
 begin
   if Pref.NoTransURL then
     TransOpt := [toConvertURL, toNoChoice, toWaitScriptEnd]
@@ -2557,11 +2549,7 @@ begin
   if Pref.FixMessySurface then TransOpt := TransOpt + [toFixMessySurface];
   if Pref.HUTagTo01Tag then TransOpt := TransOpt + [toHUTagTo01Tag];
   Result := Script;
-  Err := DoTrans(Result, TransOpt);
-  if Length(Err) > 0 then begin
-    Result := '';
-    Error := Err;
-  end;
+  Error := DoTrans(Result, TransOpt);
 end;
 
 procedure TfrmSender.FormResize(Sender: TObject);