History

Add the ability to get the context that a script is running in

Ryan Huffman committed 9 years ago

Commit 9b1cd521 parent 6da188b7 files · +47 −10Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+18−1
@@ -168,7 +168,8 @@ static bool hadUncaughtExceptions(QScriptEngine& engine, const QString& fileName · 167 unmodified lines
168168 return false;
169169 }
170170
171−ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString) :
171+ScriptEngine::ScriptEngine(Context context, const QString& scriptContents, const QString& fileNameString) :
172+ _context(context),
172173 _scriptContents(scriptContents),
173174 _timerFunctionMap(),
174175 _fileNameString(fileNameString),
@@ -183,6 +184,22 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNam · 8 unmodified lines
183184 setProcessEventsInterval(MSECS_PER_SECOND);
184185 }
185186
187+QString ScriptEngine::getContext() const {
188+ switch (_context) {
189+ case CLIENT_SCRIPT:
190+ return "client";
191+ case ENTITY_CLIENT_SCRIPT:
192+ return "entity_client";
193+ case ENTITY_SERVER_SCRIPT:
194+ return "entity_server";
195+ case AGENT_SCRIPT:
196+ return "agent";
197+ default:
198+ return "unknown";
199+ }
200+ return "unknown";
201+}
202+
186203 ScriptEngine::~ScriptEngine() {
187204 scriptInfoMessage("Script Engine shutting down:" + getFilename());
188205