mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2026-08-19 22:17:13 +00:00
Merge remote-tracking branch 'origin/master-ng' into develop
# Conflicts: # Moose Development/Moose/Core/Event.lua
This commit is contained in:
@@ -1068,7 +1068,8 @@ end
|
|||||||
|
|
||||||
do -- Event Creation
|
do -- Event Creation
|
||||||
|
|
||||||
--- Creation of a New Cargo Event.
|
-- TODO Remove old Cargo event
|
||||||
|
--- Creation of a New Cargo Event.
|
||||||
-- @param #EVENT self
|
-- @param #EVENT self
|
||||||
-- @param AI.AI_Cargo#AI_CARGO Cargo The Cargo created.
|
-- @param AI.AI_Cargo#AI_CARGO Cargo The Cargo created.
|
||||||
function EVENT:CreateEventNewCargo( Cargo )
|
function EVENT:CreateEventNewCargo( Cargo )
|
||||||
@@ -1083,6 +1084,7 @@ do -- Event Creation
|
|||||||
world.onEvent( Event )
|
world.onEvent( Event )
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- TODO Remove old Cargo event
|
||||||
--- Creation of a Cargo Deletion Event.
|
--- Creation of a Cargo Deletion Event.
|
||||||
-- @param #EVENT self
|
-- @param #EVENT self
|
||||||
-- @param AI.AI_Cargo#AI_CARGO Cargo The Cargo created.
|
-- @param AI.AI_Cargo#AI_CARGO Cargo The Cargo created.
|
||||||
|
|||||||
Reference in New Issue
Block a user