From a95afe995610a1d53babcaa74794d1546b196868 Mon Sep 17 00:00:00 2001
From: FlightControl_Master <sven.van.de.velde@telenet.be>
Date: Sun, 8 Apr 2018 22:36:58 +0200
Subject: [PATCH] # Conflicts: #	Moose Development/Moose/Tasking/Task_CARGO.lua

---
 .../Moose/Tasking/Task_CARGO.lua              |  2 ++
 .../Moose/Tasking/Task_Cargo_Dispatcher.lua   | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Moose Development/Moose/Tasking/Task_CARGO.lua b/Moose Development/Moose/Tasking/Task_CARGO.lua
index 055604c9c..7976fe39e 100644
--- a/Moose Development/Moose/Tasking/Task_CARGO.lua	
+++ b/Moose Development/Moose/Tasking/Task_CARGO.lua	
@@ -643,6 +643,8 @@ do -- TASK_CARGO
       
       self:F( { Cargo = Cargo } )
       
+      self:F( { Cargo = Cargo } )
+      
       local TaskUnitName = TaskUnit:GetName()
       self:F( { TaskUnit = TaskUnitName, Task = Task and Task:GetClassNameAndID() } )
       
diff --git a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua
index ca96b2d87..11c9feede 100644
--- a/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua	
+++ b/Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua	
@@ -429,17 +429,17 @@ do -- TASK_CARGO_DISPATCHER
 
   --- Add a Transport task to transport cargo from fixed locations to a deployment zone.
   -- @param #TASK_CARGO_DISPATCHER self
-  -- @param #string TransportTaskName (optional) The name of the transport task. 
+  -- @param #string TaskName (optional) The name of the transport task. 
   -- @param Core.SetCargo#SET_CARGO SetCargo The SetCargo to be transported.
   -- @param #string Briefing The briefing of the task transport to be shown to the player.
   -- @return #TASK_CARGO_DISPATCHER
   -- @usage
   -- 
   --   -- Add a Transport task to transport cargo of different types to a Transport Deployment Zone.
-  function TASK_CARGO_DISPATCHER:AddTransportTask( TransportTaskName, SetCargo, Briefing )
+  function TASK_CARGO_DISPATCHER:AddTransportTask( TaskName, SetCargo, Briefing )
 
     self.TransportCount = self.TransportCount + 1
-    local TaskName = string.format( ( TransportTaskName or "Transport" ) .. ".%03d", self.TransportCount )
+    local TaskName = string.format( ( TaskName or "Transport" ) .. ".%03d", self.TransportCount )
     
     self.Transport[TaskName] = {} 
     self.Transport[TaskName].SetCargo = SetCargo
@@ -452,13 +452,15 @@ do -- TASK_CARGO_DISPATCHER
   
   --- Define one deploy zone for the Transport tasks.
   -- @param #TASK_CARGO_DISPATCHER self
-  -- @param #string TransportTaskName (optional) The name of the Transport task. 
+  -- @param #string TaskName (optional) The name of the Transport task. 
   -- @param TransportDeployZone A Transport deploy zone.
   -- @return #TASK_CARGO_DISPATCHER
-  function TASK_CARGO_DISPATCHER:SetTransportDeployZone( TransportTaskName, TransportDeployZone )
+  function TASK_CARGO_DISPATCHER:SetTransportDeployZone( TaskName, TransportDeployZone )
 
-    if TransportTaskName then
-      self.Transport[TransportTaskName].DeployZones = { TransportDeployZone }
+    if self.Transport[TaskName] then
+      self.Transport[TaskName].DeployZones = { TransportDeployZone }
+    else
+      error( "TaskName does not exist" )
     end
   
     return self
@@ -467,14 +469,16 @@ do -- TASK_CARGO_DISPATCHER
   
   --- Define the deploy zones for the Transport tasks.
   -- @param #TASK_CARGO_DISPATCHER self
-  -- @param #string TransportTaskName (optional) The name of the Transport task.
+  -- @param #string TaskName (optional) The name of the Transport task.
   -- @param TransportDeployZones A list of the Transport deploy zones.
   -- @return #TASK_CARGO_DISPATCHER
   -- 
-  function TASK_CARGO_DISPATCHER:SetTransportDeployZones( TransportTaskName, TransportDeployZones )
+  function TASK_CARGO_DISPATCHER:SetTransportDeployZones( TaskName, TransportDeployZones )
 
-    if TransportTaskName then
-      self.Transport[TransportTaskName].DeployZones = TransportDeployZones
+    if self.Transport[TaskName] then
+      self.Transport[TaskName].DeployZones = TransportDeployZones
+    else
+      error( "TaskName does not exist" )
     end
   
     return self