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

Merge pull request #1024 from overte-org/fix/entity_script_messages

Browse source 
Temporary fix for some script messages not being transmitted
This commit is contained in:
ksuprynowicz 2024-06-15 21:23:25 +02:00 committed by GitHub
commit b3eadb5b1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/script-engine/src/ScriptManager.cpp
View file

@ -589,6 +589,10 @@ void ScriptManager::scriptErrorMessage(const QString& message, const QString& fi
emit errorMessage(message, getFilename()); emit errorMessage(message, getFilename());
if (!currentEntityIdentifier.isInvalidID()) { if (!currentEntityIdentifier.isInvalidID()) {
emit errorEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript()); emit errorEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript());
} else {
if (isEntityServerScript()) {
emit errorEntityMessage(message, fileName, lineNumber, EntityItemID(), isEntityServerScript());
}
} }
} }
@ -597,6 +601,10 @@ void ScriptManager::scriptWarningMessage(const QString& message, const QString&
emit warningMessage(message, getFilename()); emit warningMessage(message, getFilename());
if (!currentEntityIdentifier.isInvalidID()) { if (!currentEntityIdentifier.isInvalidID()) {
emit warningEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript()); emit warningEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript());
} else {
if (isEntityServerScript()) {
emit warningEntityMessage(message, fileName, lineNumber, EntityItemID(), isEntityServerScript());
}
} }
} }
@ -605,6 +613,10 @@ void ScriptManager::scriptInfoMessage(const QString& message, const QString& fil
emit infoMessage(message, getFilename()); emit infoMessage(message, getFilename());
if (!currentEntityIdentifier.isInvalidID()) { if (!currentEntityIdentifier.isInvalidID()) {
emit infoEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript()); emit infoEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript());
} else {
if (isEntityServerScript()) {
emit infoEntityMessage(message, fileName, lineNumber, EntityItemID(), isEntityServerScript());
}
} }
} }
@ -613,6 +625,12 @@ void ScriptManager::scriptPrintedMessage(const QString& message, const QString&
emit printedMessage(message, getFilename()); emit printedMessage(message, getFilename());
if (!currentEntityIdentifier.isInvalidID()) { if (!currentEntityIdentifier.isInvalidID()) {
emit printedEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript()); emit printedEntityMessage(message, fileName, lineNumber, currentEntityIdentifier, isEntityServerScript());
} else {
if (isEntityServerScript()) {
// TODO: Some callbacks like for example websockets one right now
// don't set currentEntityIdentifier and there doesn't seem to be easy way to add it currently
emit printedEntityMessage(message, fileName, lineNumber, EntityItemID(), isEntityServerScript());
}
} }
} }