PHP7.4-Compatibility: FlowPath::getFlowNodeFrom() putting optional parameter after the required one

mchekin · mchekin · commit b2bfd75de032 · 2021-03-13T12:22:10.000+01:00
diff --git a/core/AI/pathfind.ai.php b/core/AI/pathfind.ai.php
@@ -111,7 +111,7 @@ public function canGoTo($from = [], $direction = 0, $checkFlow = false, $step =
             return true;
         }
 
-        $stepT = $this->getFlowNodeFrom($from, $direction);
+        $stepT = $this->getFlowNodeFrom($direction, $from);
 
         if ($stepT != $step) {
             return false;
@@ -320,7 +320,7 @@ public function getPathFromFlow($from = null, $steps = null) {
         }
 
         $dir  = $this->getDirection($from, $this->destination, true, $steps);
-        $next = $this->getFlowNodeFrom($from, $dir);
+        $next = $this->getFlowNodeFrom($dir, $from);
 
         if ($next == $steps) {
             $nDir = $this->getNodeDir($from, $dir);
@@ -520,7 +520,7 @@ public function getAroundNodes($from = []) {
         ];
     }
 
-    public function getFlowNodeFrom($from = [], $direction) {
+    public function getFlowNodeFrom($direction, $from = []) {
         switch ($direction) {
             case self::DIR_NORTH:
                 return (isset($this->mapFlow[($from[1] - 1)][($from[0])]) ? $this->mapFlow[($from[1] - 1)][($from[0])] : -1);
@@ -608,14 +608,14 @@ public function getFlowNodeFrom($from = [], $direction) {
 
     public function getAroundFlowNodes($from = []) {
         $ret = [
-            self::DIR_NORTH     => [0 => ($from[0]), 1 => ($from[1] - 1), 3 => $this->getFlowNodeFrom($from, self::DIR_NORTH)],
-            self::DIR_NORTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] - 1), 3 => $this->getFlowNodeFrom($from, self::DIR_NORTHEAST)],
-            self::DIR_EAST      => [0 => ($from[0] + 1), 1 => ($from[1]), 3 => $this->getFlowNodeFrom($from, self::DIR_EAST)],
-            self::DIR_SOUTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] + 1), 3 => $this->getFlowNodeFrom($from, self::DIR_SOUTHEAST)],
-            self::DIR_SOUTH     => [0 => ($from[0]), 1 => ($from[1] + 1), 3 => $this->getFlowNodeFrom($from, self::DIR_SOUTH)],
-            self::DIR_SOUTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] + 1), 3 => $this->getFlowNodeFrom($from, self::DIR_SOUTHWEST)],
-            self::DIR_WEST      => [0 => ($from[0] - 1), 1 => ($from[1]), 3 => $this->getFlowNodeFrom($from, self::DIR_WEST)],
-            self::DIR_NORTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] - 1), 3 => $this->getFlowNodeFrom($from, self::DIR_NORTHWEST)],
+            self::DIR_NORTH     => [0 => ($from[0]), 1 => ($from[1] - 1), 3 => $this->getFlowNodeFrom(self::DIR_NORTH, $from)],
+            self::DIR_NORTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] - 1), 3 => $this->getFlowNodeFrom(self::DIR_NORTHEAST, $from)],
+            self::DIR_EAST      => [0 => ($from[0] + 1), 1 => ($from[1]), 3 => $this->getFlowNodeFrom(self::DIR_EAST, $from)],
+            self::DIR_SOUTHEAST => [0 => ($from[0] + 1), 1 => ($from[1] + 1), 3 => $this->getFlowNodeFrom(self::DIR_SOUTHEAST, $from)],
+            self::DIR_SOUTH     => [0 => ($from[0]), 1 => ($from[1] + 1), 3 => $this->getFlowNodeFrom(self::DIR_SOUTH, $from)],
+            self::DIR_SOUTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] + 1), 3 => $this->getFlowNodeFrom(self::DIR_SOUTHWEST, $from)],
+            self::DIR_WEST      => [0 => ($from[0] - 1), 1 => ($from[1]), 3 => $this->getFlowNodeFrom(self::DIR_WEST, $from)],
+            self::DIR_NORTHWEST => [0 => ($from[0] - 1), 1 => ($from[1] - 1), 3 => $this->getFlowNodeFrom(self::DIR_NORTHWEST, $from)],
         ];
 
         foreach ($ret as $nk => $node) {
