Merge pull request #34 from Atlante45/ess-pr

Temporarily remove AvatarList from EntityScriptServer

Stephen Birarda committed 9 years ago

Commit 9282f552 parents c8e27ec e54e35f1 file · +0 −1Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 1 file). Show all

Unified · Split

@@ -215,7 +215,6 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 214 unmodified lines
215	auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor);	215	auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor);
216	newEngine->globalObject().setProperty("WebSocketServer", webSocketServerConstructorValue);	216	newEngine->globalObject().setProperty("WebSocketServer", webSocketServerConstructorValue);
217		217
218	newEngine->registerGlobalObject("AvatarList", DependencyManager::get<AvatarHashMap>().data());
219	newEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data());	218	newEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data());
220		219
221	// connect this script engines printedMessage signal to the global ScriptEngines these various messages	220	// connect this script engines printedMessage signal to the global ScriptEngines these various messages