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

Merge pull request #1446 from Areloch/disconnectCallFix

Browse source 
Fix disconnect function call behavior
This commit is contained in:
Brian Roberts 2025-04-22 18:23:30 -05:00 committed by GitHub
parent 28c8690d72 7b7de1f10f
commit 0eafadb1a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.tscript
View file

@ -111,8 +111,12 @@ function handleConnectionErrorMessage(%msgType, %msgString, %msgError)
//-----------------------------------------------------------------------------
// Disconnect
//-----------------------------------------------------------------------------
function disconnect()
{
callOnModules("disconnect");
}
function Core_ClientServer::disconnect(%this)
{
// We need to stop the client side simulation
// else physics resources will not cleanup properly.

9
Templates/BaseGame/game/tools/tools.tscript
View file

@ -23,4 +23,13 @@ function ToolsModule::onCreate(%this)
function ToolsModule::onDestroy(%this)
{
}
function ToolsModule::disconnect(%this)
{
if ( isObject( Editor ) && Editor.isEditorEnabled() )
{
EditorGui.saveAs = false; //whatever edits we were doing are irrelevent now
Editor.close(MainMenuGui);
}
}

37
Templates/BaseGame/game/tools/worldEditor/scripts/editor.ed.tscript
View file

@ -164,40 +164,3 @@ function toggleEditor(%make)
//------------------------------------------------------------------------------
// The editor action maps are defined in editor.bind.tscript
GlobalActionMap.bind(keyboard, "f11", fastLoadWorldEdit);
// The scenario:
// The editor is open and the user closes the level by any way other than
// the file menu ( exit level ), eg. typing disconnect() in the console.
//
// The problem:
// Editor::close() is not called in this scenario which means onEditorDisable
// is not called on objects which hook into it and also gEditingMission will no
// longer be valid.
//
// The solution:
// Override the stock disconnect() function which is in game scripts from here
// in tools so we avoid putting our code in there.
//
// Disclaimer:
// If you think of a better way to do this feel free. The thing which could
// be dangerous about this is that no one will ever realize this code overriding
// a fairly standard and core game script from a somewhat random location.
// If it 'did' have unforscene sideeffects who would ever find it?
package EditorDisconnectOverride
{
function disconnect()
{
if ( isObject( Editor ) && Editor.isEditorEnabled() )
{
EditorGui.saveAs = false; //whatever edits we were doing are irrelevent now
%mainMenuGUI = ProjectSettings.value("UI/mainMenuName");
if (isObject( %mainMenuGUI ))
Editor.close( %mainMenuGUI );
}
Parent::disconnect();
}
};
activatePackage( EditorDisconnectOverride );