Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:58:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More fixes

Browse source
This commit is contained in:
luiscuenca 2018-04-25 19:46:31 -07:00
parent e0770f06b1
commit 12f578c93c
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/src/Application.cpp
View file

@ -4731,16 +4731,14 @@ void Application::init() {
} }
void Application::loadAvatarScripts(const QVector<QString>& urls) { void Application::loadAvatarScripts(const QVector<QString>& urls) {
if (auto avatar = getMyAvatar()) { if (urls.size() > 0) {
if (urls.size() > 0) { auto scriptEngines = DependencyManager::get<ScriptEngines>();
auto scriptEngines = DependencyManager::get<ScriptEngines>(); auto runningScripts = scriptEngines->getRunningScripts();
auto runningScripts = scriptEngines->getRunningScripts(); for (auto url : urls) {
for (auto url : urls) { int index = runningScripts.indexOf(url);
int index = runningScripts.indexOf(url); if (index < 0) {
if (index < 0) { scriptEngines->loadScript(url);
scriptEngines->loadScript(url); getMyAvatar()->addScriptToUnload(url);
avatar->addScriptToUnload(url);
}
} }
} }
} }

2
interface/src/avatar/MyAvatar.cpp
View file

@ -2838,7 +2838,7 @@ float MyAvatar::getWalkSpeed() const {
return _walkSpeed.get() * _walkSpeedScalar; return _walkSpeed.get() * _walkSpeedScalar;
} }
void MyAvatar::addScriptToUnload(QString& url) { void MyAvatar::addScriptToUnload(const QString& url) {
_scriptsToUnload.push_back(url); _scriptsToUnload.push_back(url);
} }

2
interface/src/avatar/MyAvatar.h
View file

@ -594,7 +594,7 @@ public:
void setWalkSpeed(float value); void setWalkSpeed(float value);
float getWalkSpeed() const; float getWalkSpeed() const;
void addScriptToUnload(QString& url); void addScriptToUnload(const QString& url);
const QVector<QString>& getScriptsToUnload() const { return _scriptsToUnload; }; const QVector<QString>& getScriptsToUnload() const { return _scriptsToUnload; };
public slots: public slots: