Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #20 from birarda/entity-script-server

Browse source 
call script engine shutdown when assignment stopping
This commit is contained in:
Clément Brisset 2017-01-19 17:02:09 -08:00 committed by GitHub
commit 1f04bbee0a
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/scripts/EntityScriptServer.cpp
View file

@ -254,7 +254,7 @@ void EntityScriptServer::clear() {
_entityViewer.clear();
}
void EntityScriptServer::shutdown() {
void EntityScriptServer::shutdownScriptEngine() {
if (_entitiesScriptEngine) {
_entitiesScriptEngine->disconnectNonEssentialSignals(); // disconnect all slots/signals from the script engine, except essential
}
@ -351,6 +351,8 @@ void EntityScriptServer::handleJurisdictionPacket(QSharedPointer<ReceivedMessage
}
void EntityScriptServer::aboutToFinish() {
shutdownScriptEngine();
// our entity tree is going to go away so tell that to the EntityScriptingInterface
DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr);

3
assignment-client/src/scripts/EntityScriptServer.h
View file

@ -48,7 +48,8 @@ private:
void resetEntitiesScriptEngine();
void clear();
void shutdown();
void shutdownScriptEngine();
void addingEntity(const EntityItemID& entityID);
void deletingEntity(const EntityItemID& entityID);
void entityServerScriptChanging(const EntityItemID& entityID, const bool reload);