History

better support for includes in entity scripts

ZappoMan committed 11 years ago

Commit cd0ee0f1 parent 137642f4 files · +25 −6Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.h+3−0
@@ -93,6 +93,8 @@ public: · 92 unmodified lines
93 void setUserLoaded(bool isUserLoaded) { _isUserLoaded = isUserLoaded; }93 void setUserLoaded(bool isUserLoaded) { _isUserLoaded = isUserLoaded; }
94 bool isUserLoaded() const { return _isUserLoaded; }94 bool isUserLoaded() const { return _isUserLoaded; }
95 95
96 void setParentURL(const QString& parentURL) { _parentURL = parentURL; }
97
96public slots:98public slots:
97 void stop();99 void stop();
98 100
@@ -121,6 +123,7 @@ signals: · 22 unmodified lines
121 123
122protected:124protected:
123 QString _scriptContents;125 QString _scriptContents;
126 QString _parentURL;
124 bool _isFinished;127 bool _isFinished;
125 bool _isRunning;128 bool _isRunning;
126 bool _isInitialized;129 bool _isInitialized;