# HG changeset patch
# User unc0rr
# Date 1540034550 -7200
# Node ID 48796bef9e696cbcc4aa60d523d5d1e7b95f8069
# Parent  a1895019bb9482734ac6c9e7f127af334789eb57
Add --protocol option to engine

diff -r a1895019bb94 -r 48796bef9e69 hedgewars/ArgParsers.pas
--- a/hedgewars/ArgParsers.pas	Fri Oct 19 02:19:50 2018 +0300
+++ b/hedgewars/ArgParsers.pas	Sat Oct 20 13:22:30 2018 +0200
@@ -109,6 +109,7 @@
     WriteLn(stdout, 'Miscellaneous:');
     WriteLn(stdout, '  --nick <name>: Set user nickname');
     WriteLn(stdout, '  --help: Show a list of command-line options and exit');
+    WriteLn(stdout, '  --protocol: Display protocol number and exit');
     WriteLn(stdout, '');
     Writeln(stdout, 'Advanced options:');
     Writeln(stdout, '  --stereo <value>: Set stereoscopic rendering (1 to 14)');
@@ -120,6 +121,13 @@
     helpCommandUsed:= true;
 end;
 
+procedure DisplayProtocol;
+begin
+    WriteLn(stdout, IntToStr(cNetProtoVersion));
+    GameType:= gmtSyntaxHelp;
+    helpCommandUsed:= true;
+end;
+
 procedure setDepth(var paramIndex: LongInt);
 begin
     WriteLn(stdout, 'WARNING: --depth is a deprecated command, which could be removed in a future version!');
@@ -231,13 +239,13 @@
       otherarray: array [0..2] of string = ('--locale','--fullscreen','--showfps');
       mediaarray: array [0..9] of string = ('--fullscreen-width', '--fullscreen-height', '--width', '--height', '--depth', '--volume','--nomusic','--nosound','--locale','--fullscreen');
       allarray: array [0..18] of string = ('--fullscreen-width','--fullscreen-height', '--width', '--height', '--depth','--volume','--nomusic','--nosound','--nodampen','--locale','--fullscreen','--showfps','--altdmg','--frame-interval','--low-quality','--no-teamtag','--no-hogtag','--no-healthtag','--translucent-tags');
-      reallyAll: array[0..36] of shortstring = (
+      reallyAll: array[0..37] of shortstring = (
                 '--prefix', '--user-prefix', '--locale', '--fullscreen-width', '--fullscreen-height', '--width',
                 '--height', '--frame-interval', '--volume','--nomusic', '--nosound', '--nodampen',
                 '--fullscreen', '--showfps', '--altdmg', '--low-quality', '--raw-quality', '--stereo', '--nick',
   {deprecated}  '--depth', '--set-video', '--set-audio', '--set-other', '--set-multimedia', '--set-everything',
   {internal}    '--internal', '--port', '--recorder', '--landpreview',
-  {misc}        '--stats-only', '--gci', '--help','--no-teamtag','--no-hogtag','--no-healthtag','--translucent-tags','--lua-test');
+  {misc}        '--stats-only', '--gci', '--help','--protocol', '--no-teamtag','--no-hogtag','--no-healthtag','--translucent-tags','--lua-test');
 var cmdIndex: byte;
 begin
     parseParameter:= false;
@@ -283,11 +291,12 @@
         {--stats-only}          29 : statsOnlyGame();
         {--gci}                 30 : GciEasterEgg();
         {--help}                31 : DisplayUsage();
-        {--no-teamtag}          32 : cTagsMask := cTagsMask and (not htTeamName);
-        {--no-hogtag}           33 : cTagsMask := cTagsMask and (not htName);
-        {--no-healthtag}        34 : cTagsMask := cTagsMask and (not htHealth);
-        {--translucent-tags}    35 : cTagsMask := cTagsMask or htTransparent;
-        {--lua-test}            36 : begin cTestLua := true; SetSound(false); cScriptName := getstringParameter(arg, paramIndex, parseParameter); WriteLn(stdout, 'Lua test file specified: ' + cScriptName);end;
+        {--protocol}            32 : DisplayProtocol();
+        {--no-teamtag}          33 : cTagsMask := cTagsMask and (not htTeamName);
+        {--no-hogtag}           34 : cTagsMask := cTagsMask and (not htName);
+        {--no-healthtag}        35 : cTagsMask := cTagsMask and (not htHealth);
+        {--translucent-tags}    36 : cTagsMask := cTagsMask or htTransparent;
+        {--lua-test}            37 : begin cTestLua := true; SetSound(false); cScriptName := getstringParameter(arg, paramIndex, parseParameter); WriteLn(stdout, 'Lua test file specified: ' + cScriptName);end;
     else
         begin
         //Assume the first "non parameter" is the demo file, anything else is invalid
diff -r a1895019bb94 -r 48796bef9e69 rust/integral-geometry/src/lib.rs
--- a/rust/integral-geometry/src/lib.rs	Fri Oct 19 02:19:50 2018 +0300
+++ b/rust/integral-geometry/src/lib.rs	Sat Oct 20 13:22:30 2018 +0200
@@ -155,7 +155,7 @@
             Some(result)
         } else if self.point.x == self.point.y {
             self.point.x += 1;
-            
+
             Some(self.point)
         } else {
             None