TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Failed to get the Scene changes for the Full template rolled up. This corrects that.

Browse source
This commit is contained in:
Areloch 2019-03-31 22:12:38 -05:00
parent 582e4f0130
commit 5cefad72b3
31 changed files with 167 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Templates/Full/game/scripts/server/gameCore.cs
View file

@ -134,12 +134,12 @@ package GameCore
// to caching mission lighting.
$missionCRC = getFileCRC( %file );
// Exec the mission. The MissionGroup (loaded components) is added to the ServerGroup
// Exec the mission. The Scene (loaded components) is added to the ServerGroup
exec(%file);
if( !isObject(MissionGroup) )
if( !isObject(getRootScene()) )
{
$Server::LoadFailMsg = "No 'MissionGroup' found in mission \"" @ %file @ "\".";
$Server::LoadFailMsg = "No Scene found in mission \"" @ %file @ "\".";
}
}

2
Templates/Full/game/scripts/server/item.cs
View file

@ -92,7 +92,7 @@ function ItemData::onThrow(%this, %user, %amount)
rotation = "0 0 1 "@ (getRandom() * 360);
count = %amount;
};
MissionGroup.add(%obj);
getRootScene().add(%obj);
%obj.schedulePop();
return %obj;
}

8
Templates/Full/game/scripts/server/turret.cs
View file

@ -87,7 +87,7 @@ function TurretShapeData::onRemove(%this, %obj)
}
// This is on MissionGroup so it doesn't happen when the mission has ended
function MissionGroup::respawnTurret(%this, %datablock, %className, %transform, %static, %respawn)
function Scene::respawnTurret(%this, %datablock, %className, %transform, %static, %respawn)
{
%turret = new (%className)()
{
@ -97,7 +97,7 @@ function MissionGroup::respawnTurret(%this, %datablock, %className, %transform,
};
%turret.setTransform(%transform);
MissionGroup.add(%turret);
getRootScene().add(%turret);
return %turret;
}
@ -149,7 +149,7 @@ function TurretShapeData::onDestroyed(%this, %obj, %lastState)
if (%obj.doRespawn())
{
MissionGroup.schedule($TurretShape::RespawnTime, "respawnTurret", %this, %obj.getClassName(), %obj.getTransform(), true, true);
getRootScene().schedule($TurretShape::RespawnTime, "respawnTurret", %this, %obj.getClassName(), %obj.getTransform(), true, true);
}
}
@ -331,7 +331,7 @@ function AITurretShapeData::onThrow(%this, %user, %amount)
client = %user.client;
isAiControlled = true;
};
MissionGroup.add(%obj);
getRootScene().add(%obj);
// Let the turret know that we're a firend
%obj.addToIgnoreList(%user);