moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-22 01:02:17 -05:00
Code Issues Releases Wiki Activity

...

Browse Source
This commit is contained in:
Merlijn Wajer 2010-05-09 22:56:23 +02:00
parent ab4d147e08
commit 3ba7e3a4c4
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Projects/SAMufasaGUI/testunit.pas
View File

@ -1418,11 +1418,8 @@ var
ErrorMsg : string;
begin
DoRun := false;
<<<<<<< HEAD
=======
// 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
writeln('Opening file: ' + ParamStr(1));
@ -1431,14 +1428,9 @@ begin
LoadScriptFile(paramstr(1));
end;
end else
<<<<<<< HEAD
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:']);
>>>>>>> c8103490d871d7f0c46c3bbf5d9a954a2be64c97
if ErrorMsg <> '' then
begin
mDebugLn('ERROR IN COMMAND LINE ARGS: ' + ErrorMSG)