# HG changeset patch
# User koda
# Date 1355700889 -3600
# Node ID cdf83bdf7b27e0454de85cfb4b6a2b52a23fd3ed
# Parent  8d7c52b24e28d2655c5badf6a9c5a5bd515e2df6
move GetParams in ArgParser, print a warning when using a deprecated command, pascalisation of +1s

diff -r 8d7c52b24e28 -r cdf83bdf7b27 hedgewars/ArgParsers.inc
--- a/hedgewars/ArgParsers.inc	Mon Dec 17 00:18:18 2012 +0100
+++ b/hedgewars/ArgParsers.inc	Mon Dec 17 00:34:49 2012 +0100
@@ -73,11 +73,9 @@
 
 procedure DisplayUsage;
 begin
-    WriteLn(stdout, 'Usage:');
+    WriteLn(stdout, 'Usage: hwengine <path to replay file> [options]');
     WriteLn(stdout, '');
-    WriteLn(stdout, '  hwengine <path to replay file> [options]');
-    WriteLn(stdout, '');
-    WriteLn(stdout, 'where [options] are any of the following:');
+    WriteLn(stdout, 'where [options] can be any of the following:');
     WriteLn(stdout, ' --prefix [path to folder]');
     WriteLn(stdout, ' --user-prefix [path to folder]');
     WriteLn(stdout, ' --locale [name of language file]');
@@ -102,7 +100,7 @@
 function getLongIntParameter(str:String; var paramIndex:LongInt; var wrongParameter:Boolean): LongInt;
 var tmpInt, c: LongInt;
 begin
-    paramIndex:= paramIndex + 1;
+    inc(paramIndex);
     val(str, tmpInt, c);
     wrongParameter:= c <> 0;
     if wrongParameter then
@@ -112,7 +110,7 @@
 
 function getStringParameter(str:String; var paramIndex:LongInt; var wrongParameter:Boolean): String;
 begin
-    paramIndex:= paramIndex + 1;
+    inc(paramIndex);
     wrongParameter:= (str='') or (Copy(str,1,2) = '--');
     if wrongParameter then
          WriteLn(stderr, 'ERROR: '+ParamStr(paramIndex-1)+' expects a string, you passed "'+str+'"');
@@ -208,6 +206,11 @@
 var index, tmpInt: LongInt;
     isBool: Boolean;
 begin
+    WriteLn(stdout, 'WARNING: you are using a deprecated command, which could be removed in a future version!');
+    WriteLn(stdout, '         Consider updating to the latest syntax, which is much more flexible!');
+    WriteLn(stdout, '         Run `hwegine --help` to learn it!');
+    WriteLn(stdout, '');
+
     index:= 0;
     tmpInt:= 1;
     while (index < size) do
@@ -222,20 +225,21 @@
             or (cmdArray[index] = '--low-quality');
         if (not isBool) or ((ParamStr(paramIndex)='1') and (cmdArray[index]<>'--nomusic') and (cmdArray[index]<>'--nosound')) then
             parseParameter(cmdArray[index], ParamStr(paramIndex), tmpInt);
-        index:= index+1;
+        inc(index);
         end;
 end;
 
-procedure playReplayFileWithParameters(paramIndex: LongInt);
-var tmpInt: LongInt;
+procedure playReplayFileWithParameters;
+var paramIndex: LongInt;
     wrongParameter: boolean;
 begin
+    paramIndex:= 1;
     wrongParameter:= false;
     while (paramIndex <= ParamCount) do
         begin
         if parseParameter( ParamStr(paramIndex), ParamStr(paramIndex+1), paramIndex) then
             wrongParameter:= true;
-        paramIndex:= paramIndex+1;
+        inc(paramIndex);
         end;
     if wrongParameter = true then
         begin
@@ -243,3 +247,55 @@
         GameType:= gmtSyntax;
         end
 end;
+
+procedure GetParams;
+begin
+    (*
+    tmpInt:=0;
+    while (tmpInt <= ParamCount) do
+        begin
+        WriteLn(stdout,inttostr(tmpInt) + ': ' + ParamStr(tmpInt));
+        inc(tmpInt);
+        end;
+    *)
+
+    if (ParamCount = 3) and (ParamStr(3) = 'landpreview') then
+    begin
+        PathPrefix := ParamStr(1);
+        ipcPort    := StrToInt(ParamStr(2));
+        GameType   := gmtLandPreview;
+        exit;
+    end;
+
+    //TODO: prepend something so that we can use a cDefaultParamNum of parameters
+    if ParamCount = cDefaultParamNum then
+    begin
+        internalStartGameWithParameters();
+        exit;
+    end
+{$IFDEF USE_VIDEO_RECORDING}
+    else if ParamCount = cVideorecParamNum then
+    begin
+        internalStartVideoRecordingWithParameters();
+        exit;
+    end
+{$ENDIF};
+
+    UserPathPrefix := '.';
+    PathPrefix     := cDefaultPathPrefix;
+    recordFileName := '';
+    playReplayFileWithParameters();
+
+    if (recordFileName = '') then
+        begin
+        DisplayUsage();
+        GameType:= gmtSyntax;
+        end;
+    (*
+    WriteLn(stdout,'PathPrefix:     ' + PathPrefix);
+    WriteLn(stdout,'UserPathPrefix: ' + UserPathPrefix);
+    WriteLn(stdout,'recordFilename: ' + recordFilename);
+    *)
+end;
+
+
diff -r 8d7c52b24e28 -r cdf83bdf7b27 hedgewars/hwengine.pas
--- a/hedgewars/hwengine.pas	Mon Dec 17 00:18:18 2012 +0100
+++ b/hedgewars/hwengine.pas	Mon Dec 17 00:34:49 2012 +0100
@@ -543,62 +543,8 @@
 
 {$IFNDEF HWLIBRARY}
 
-///////////////////////////////////////////////////////////////////////////////
 {$INCLUDE "ArgParsers.inc"}
 
-procedure GetParams;
-var startIndex,tmpInt: LongInt;
-    debug: string;
-begin
-    (*
-    tmpInt:=0;
-    while (tmpInt <= ParamCount) do
-        begin
-        WriteLn(stdout,inttostr(tmpInt) + ': ' + ParamStr(tmpInt));
-        inc(tmpInt);
-        end;
-    *)
-
-    if (ParamCount = 3) and (ParamStr(3) = 'landpreview') then
-    begin
-        PathPrefix := ParamStr(1);
-        ipcPort    := StrToInt(ParamStr(2));
-        GameType   := gmtLandPreview;
-        exit;
-    end;
-
-    //TODO: prepend something so that we can use a cDefaultParamNum of parameters
-    if ParamCount = cDefaultParamNum then
-    begin
-        internalStartGameWithParameters();
-        exit;
-    end
-{$IFDEF USE_VIDEO_RECORDING}
-    else if ParamCount = cVideorecParamNum then
-    begin
-        internalStartVideoRecordingWithParameters();
-        exit;
-    end
-{$ENDIF};
-
-    UserPathPrefix := '.';
-    PathPrefix     := cDefaultPathPrefix;
-    recordFileName := '';
-    startIndex     := 1;
-    playReplayFileWithParameters(startIndex);
-
-    if (recordFileName = '') then
-        begin
-        DisplayUsage();
-        GameType:= gmtSyntax;
-        end;
-    (*
-    WriteLn(stdout,'PathPrefix:     ' + PathPrefix);
-    WriteLn(stdout,'UserPathPrefix: ' + UserPathPrefix);
-    WriteLn(stdout,'recordFilename: ' + recordFilename);
-    *)
-end;
-
 ///////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////// m a i n ///////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
@@ -608,9 +554,8 @@
 
     if GameType = gmtLandPreview then
         GenLandPreview()
-    else if GameType = gmtSyntax then
-        //Exit cleanly
-    else Game();
+    else if GameType <> gmtSyntax then
+        Game();
 
     // return 1 when engine is not called correctly
     halt(LongInt(GameType = gmtSyntax));