moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2025-02-16 07:10:10 -05:00
Code Issues Releases Wiki Activity

Fuck you

Browse Source
This commit is contained in:
Raymond 2010-05-09 22:53:33 +02:00
parent ab4d147e08
commit 6c1ba3dc42
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Projects/SAMufasaGUI/testunit.pas
View File

@ -1418,27 +1418,14 @@ var
ErrorMsg : string; ErrorMsg : string;
begin begin
DoRun := false; DoRun := false;
<<<<<<< HEAD if (Paramcount = 1) and not (Application.HasOption('open')) then // paramcount = 1 means we got only one parameter. We assume this to be a file. // and try to open it accordingly
=======
// paramcount = 1 means we got only one parameter. We assume this to be a file.
// and try to open it accordingly
>>>>>>> c8103490d871d7f0c46c3bbf5d9a954a2be64c97
if (Paramcount = 1) and not (Application.HasOption('open')) then
begin begin
writeln('Opening file: ' + ParamStr(1)); writeln('Opening file: ' + ParamStr(1));
if FileExists(ParamStr(1)) then if FileExists(ParamStr(1)) then
begin
LoadScriptFile(paramstr(1)); LoadScriptFile(paramstr(1));
end; end else // we have more parameters. Check for specific options. (-r -o, --run --open)
end else
<<<<<<< HEAD
begin; begin;
ErrorMsg:=Application.CheckOptions('ro:',['run','open:']);
=======
// we have more parameters. Check for specific options. (-r -o, --run --open)
begin
ErrorMsg:=Application.CheckOptions('ro:',['run', 'open:']); ErrorMsg:=Application.CheckOptions('ro:',['run', 'open:']);
>>>>>>> c8103490d871d7f0c46c3bbf5d9a954a2be64c97
if ErrorMsg <> '' then if ErrorMsg <> '' then
begin begin
mDebugLn('ERROR IN COMMAND LINE ARGS: ' + ErrorMSG) mDebugLn('ERROR IN COMMAND LINE ARGS: ' + ErrorMSG)