Merge remote-tracking branch 'data/development' into development

# Conflicts:
#	meson.build

Author: traunts

.gitignore

@@ -73,6 +73,9 @@ luac.out
 CortexCommand
 CortexCommand_debug
 
+# Debug databases
+*.pdb
+
 # Manifest files
 *.manifest
 

Data/Base.rte/AI/CrabAI.lua

@@ -1,10 +1,10 @@
-require("AI/NativeCrabAI"); --dofile("Base.rte/Actors/AI/NativeCrabAI.lua")
+require("AI/NativeCrabAI");
 
 function Create(self)
 	self.AI = NativeCrabAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 

Data/Base.rte/AI/CrabBehaviors.lua

@@ -100,8 +100,12 @@ function CrabBehaviors.Sentry(AI, Owner, Abort)
 
 		Owner:AddAISceneWaypoint(Vector(Owner.Pos.X, 0));
 		Owner:UpdateMovePath();
-		local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-		if _abrt then return true end
+
+		-- wait until movepath is updated
+		while Owner.IsWaitingOnNewMovePath do
+			local _ai, _ownr, _abrt = coroutine.yield();
+			if _abrt then return true end
+		end
 
 		-- face the direction of the first waypoint
 		for WptPos in Owner.MovePath do
@@ -354,7 +358,7 @@ function CrabBehaviors.GoToWpt(AI, Owner, Abort)
 					Waypoint = table.remove(WptList, 1);
 					if WptList[1] then
 						Owner:RemoveMovePathBeginning();
-					elseif not Owner.MOMoveTarget and SceneMan:ShortestDistance(Owner.Pos, Waypoint.Pos, false).X < 10 then	-- the last waypoint
+					elseif not Owner.MOMoveTarget and SceneMan:ShortestDistance(Owner.Pos, Waypoint.Pos, false):MagnitudeIsLessThan(Owner.MoveProximityLimit) then	-- the last waypoint
 						Owner:ClearMovePath();
 						WptList = nil;
 						Waypoint = nil;
@@ -367,18 +371,26 @@ function CrabBehaviors.GoToWpt(AI, Owner, Abort)
 						AI.lateralMoveState = Actor.LAT_LEFT;
 					elseif CurrDist.X > 3 then
 						AI.lateralMoveState = Actor.LAT_RIGHT;
-					else
+					end
+
+					if CurrDist:MagnitudeIsLessThan(Owner.MoveProximityLimit) then
 						Waypoint = nil;
 					end
 				end
 			end
-		else	-- no waypoint list, create one in several small steps to reduce lag
+		else	-- no waypoint list, create one
 			local TmpList = {};
 			table.insert(TmpList, {Pos=Owner.Pos});
+
 			Owner:UpdateMovePath();
+
+			-- wait until movepath is updated
+			while Owner.IsWaitingOnNewMovePath do
+				local _ai, _ownr, _abrt = coroutine.yield();
+				if _abrt then return true end
+			end
+
 			Owner:DrawWaypoints(true);
-			local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-			if _abrt then return true end
 
 			for WptPos in Owner.MovePath do	-- skip any waypoint too close to the previous one
 				if SceneMan:ShortestDistance(TmpList[#TmpList].Pos, WptPos, false):MagnitudeIsGreaterThan(10) then
@@ -399,9 +411,6 @@ function CrabBehaviors.GoToWpt(AI, Owner, Abort)
 				end
 			end
 
-			local _ai, _ownr, _abrt = coroutine.yield(); -- wait until next frame
-			if _abrt then return true end
-
 			WptList = TmpList;
 
 			-- create the move path seen on the screen

Data/Base.rte/AI/DropShipAI.lua

@@ -1,9 +1,9 @@
-require("AI/NativeDropShipAI"); --dofile("Base.rte/Actors/AI/NativeDropShipAI.lua");
+require("AI/NativeDropShipAI");
 
 function Create(self)
 	self.AI = NativeDropShipAI:Create(self);
 end
 
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end

Data/Base.rte/AI/HumanAI.lua

@@ -3,7 +3,7 @@ require("AI/NativeHumanAI");
 function Create(self)
 	self.AI = NativeHumanAI:Create(self);
 end
-function UpdateAI(self)
+function ThreadedUpdateAI(self)
 	self.AI:Update(self);
 end
 function Destroy(self)