Browse Source

Merge pull request #737 from Azaezel/alpha40/GCOrder

ensure MissionCleanup exists before .mis load
Brian Roberts 3 years ago
parent
commit
2198dd14d1

+ 7 - 6
Templates/BaseGame/game/core/clientServer/scripts/server/levelLoad.tscript

@@ -86,6 +86,13 @@ function loadMissionStage2()
    // Create the mission group off the ServerGroup
    // Create the mission group off the ServerGroup
    $instantGroup = ServerGroup;
    $instantGroup = ServerGroup;
 
 
+   // Mission cleanup group.  This is where run time components will reside.  The MissionCleanup
+   // group will be added to the ServerGroup.
+   new SimGroup( MissionCleanup );
+
+   // Make the MissionCleanup group the place where all new objects will automatically be added.
+   $instantGroup = MissionCleanup;
+   
    // Make sure the mission exists
    // Make sure the mission exists
    %file = $Server::MissionFile;
    %file = $Server::MissionFile;
    
    
@@ -120,12 +127,6 @@ function loadMissionStage2()
    if( isObject( theLevelInfo ) )
    if( isObject( theLevelInfo ) )
       $Server::MissionName = theLevelInfo.levelName;
       $Server::MissionName = theLevelInfo.levelName;
 
 
-   // Mission cleanup group.  This is where run time components will reside.  The MissionCleanup
-   // group will be added to the ServerGroup.
-   new SimGroup( MissionCleanup );
-
-   // Make the MissionCleanup group the place where all new objects will automatically be added.
-   $instantGroup = MissionCleanup;
    
    
    %hasGameMode = callGamemodeFunction("onCreateGame");
    %hasGameMode = callGamemodeFunction("onCreateGame");