Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 10 files). Show all
Unified · Split
| @@ -395,7 +395,7 @@ void EntityScriptServer::selectAudioFormat(const QString& selectedCodecName) { · 394 unmodified lines | |||
| 395 | } | 395 | } |
| 396 | 396 | ||
| 397 | void EntityScriptServer::resetEntitiesScriptEngine() { | 397 | void EntityScriptServer::resetEntitiesScriptEngine() { |
| 398 | auto engineName = QString("Entities %1").arg(++_entitiesScriptEngineCount); | 398 | auto engineName = QString("about:Entities %1").arg(++_entitiesScriptEngineCount); |
| 399 | auto newEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(ScriptEngine::ENTITY_SERVER_SCRIPT, NO_SCRIPT, engineName)); | 399 | auto newEngine = QSharedPointer<ScriptEngine>(new ScriptEngine(ScriptEngine::ENTITY_SERVER_SCRIPT, NO_SCRIPT, engineName)); |
| 400 | 400 | ||
| 401 | auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor); | 401 | auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor); |
| @@ -477,7 +477,7 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const · 75 unmodified lines | |||
| 477 | if (!scriptUrl.isEmpty()) { | 477 | if (!scriptUrl.isEmpty()) { |
| 478 | scriptUrl = ResourceManager::normalizeURL(scriptUrl); | 478 | scriptUrl = ResourceManager::normalizeURL(scriptUrl); |
| 479 | qCDebug(entity_script_server) << "Loading entity server script" << scriptUrl << "for" << entityID; | 479 | qCDebug(entity_script_server) << "Loading entity server script" << scriptUrl << "for" << entityID; |
| 480 | ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload); | 480 | _entitiesScriptEngine->loadEntityScript(entityID, scriptUrl, reload); |
| 481 | } | 481 | } |
| 482 | } | 482 | } |
| 483 | } | 483 | } |