TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1533 from Azaezel/alpha41/connectionCleanups

Browse source 
clean up spawn chain
This commit is contained in:
Brian Roberts 2025-08-11 09:19:13 -05:00 committed by GitHub
parent 13ec94ef6b 73abc69a82
commit 638e819f2d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Templates/BaseGame/game/core/clientServer/scripts/server/connectionToClient.tscript
View file

@ -81,8 +81,8 @@ function GameConnection::onConnect( %this, %clientData )
%this.connectData = %clientData;
//Signal and listener logic for the spawn config/processing here
%this.GetEventManager().registerEvent("setSpawnObjectTypeComplete");
//Signal and listener logic for the spawn config/processing here
%this.GetEventManager().registerEvent("setSpawnObjectTypeComplete");
%this.GetEventManager().registerEvent("setSpawnObjectTypeFailed");
%this.GetEventManager().registerEvent("setSpawnPointComplete");
%this.GetEventManager().registerEvent("setSpawnPointFailed");
@ -91,11 +91,6 @@ function GameConnection::onConnect( %this, %clientData )
%this.listener = new ScriptMsgListener() {
class = GameConnectionListener;
};
%this.GetEventManager().subscribe( %this.listener, "setSpawnObjectTypeComplete" );
%this.GetEventManager().subscribe( %this.listener, "setSpawnObjectTypeFailed" );
%this.GetEventManager().subscribe( %this.listener, "setSpawnPointComplete" );
%this.GetEventManager().subscribe( %this.listener, "setSpawnPointFailed" );
%this.GetEventManager().subscribe( %this.listener, "postSpawnComplete" );
callGamemodeFunction("onClientConnect", %this);
@ -124,9 +119,12 @@ function GameConnection::spawnControlObject( %this )
%modulesIDList = getModulesAndGameModesList(true, "Game");
%this.numModsNeedingLoaded = getNumCanCallOnObjectList("setSpawnObjectType", %modulesIDList);
if (%this.numModsNeedingLoaded)
{
%this.GetEventManager().subscribe( %this.listener, "setSpawnObjectTypeComplete" );
%this.GetEventManager().subscribe( %this.listener, "setSpawnObjectTypeFailed" );
callOnObjectList("setSpawnObjectType", %modulesIdList, %this);
}
else
%this.listener.onSetSpawnObjectTypeComplete(%this); //just jump to progress
}
@ -134,9 +132,12 @@ function GameConnection::spawnControlObject( %this )
function GameConnectionListener::onSetSpawnObjectTypeComplete( %this, %client )
{
%client.moduleLoadedDone++;
if (%client.moduleLoadedDone < %client.numModsNeedingLoaded)
return; //continue to wait
%client.GetEventManager().remove( %client.listener, "setSpawnObjectTypeComplete" );
%client.GetEventManager().remove( %client.listener, "setSpawnObjectTypeFailed" );
%client.GetEventManager().subscribe( %client.listener, "setSpawnPointComplete" );
%client.GetEventManager().subscribe( %client.listener, "setSpawnPointFailed" );
if (isObject(%client.player))
{
@ -187,6 +188,10 @@ function GameConnectionListener::onSetSpawnPointComplete( %this, %client )
if (%client.moduleLoadedDone < %client.numModsNeedingLoaded)
return; //continue to wait
%client.GetEventManager().remove( %client.listener, "setSpawnPointComplete" );
%client.GetEventManager().remove( %client.listener, "setSpawnPointFailed" );
%client.GetEventManager().subscribe( %client.listener, "postSpawnComplete" );
// Spawn with the engine's Sim::spawnObject() function
%client.player = spawnObject(%client.spawnClass, %client.spawnDataBlock, %client.spawnProperties, %client.spawnScript);
@ -286,6 +291,7 @@ function GameConnectionListener::onPostSpawnComplete(%this, %client)
if (%client.moduleLoadedDone < %client.numModsNeedingLoaded)
return; //continue to wait
%client.GetEventManager().remove( %client.listener, "postSpawnComplete" );
//Continue on. Room for special handling here if needbe but not expressly required
}
@ -357,6 +363,9 @@ function GameConnection::onDrop(%this, %reason)
if($missionRunning)
{
%hasGameMode = callGamemodeFunction("onClientLeaveGame", %this);
// Cleanup the player
if (isObject(%this.player))
%this.player.delete();
}
removeFromServerGuidList( %this.guid );

2
Templates/BaseGame/game/core/utility/scripts/helperFunctions.tscript
View file

@ -734,7 +734,7 @@ function getModulesAndGameModesList(%usePriority, %group)
function callOnObjectList(%functionName, %objectsList, %var0, %var1, %var2, %var3, %var4, %var5, %var6)
{
//Get our modules so we can exec any specific client-side loading/handling
%echoList = "Called List:";
%echoList = "Called List for "@ %functionName @":";
for(%i=0; %i < getWordCount(%objectsList); %i++)
{
%obj = getWord(%objectsList, %i);