diff options
| author | Colin Snover | 2016-09-26 20:41:37 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-09-29 19:39:16 -0500 |
| commit | 8fd19f84c800d42dfb81563116c78bcce2df5b3a (patch) | |
| tree | 6314ddce4c5c51582f62a48db97acdaa826a8deb /engines/sci/graphics | |
| parent | 6290f1e5fcc241441230912c4762828500988dab (diff) | |
| download | scummvm-rg350-8fd19f84c800d42dfb81563116c78bcce2df5b3a.tar.gz scummvm-rg350-8fd19f84c800d42dfb81563116c78bcce2df5b3a.tar.bz2 scummvm-rg350-8fd19f84c800d42dfb81563116c78bcce2df5b3a.zip | |
SCI: Deduplicate call origin formatting
Diffstat (limited to 'engines/sci/graphics')
| -rw-r--r-- | engines/sci/graphics/celobj32.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/graphics/paint16.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/sci/graphics/celobj32.cpp b/engines/sci/graphics/celobj32.cpp index e5149246e4..5aa6ea3fb3 100644 --- a/engines/sci/graphics/celobj32.cpp +++ b/engines/sci/graphics/celobj32.cpp @@ -824,7 +824,7 @@ int16 CelObjView::getNumCels(const GuiResourceId viewId, const int16 loopNo) { SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kNumCels_workarounds, &origin); switch (solution.type) { case WORKAROUND_NONE: - error("[CelObjView::getNumCels]: loop number is equal to loop count in method %s::%s (room %d, script %d, localCall %x)", origin.objectName.c_str(), origin.methodName.c_str(), origin.roomNr, origin.scriptNr, origin.localCallOffset); + error("[CelObjView::getNumCels]: loop number is equal to loop count in %s", origin.toString().c_str()); case WORKAROUND_FAKE: return (int16)solution.value; case WORKAROUND_IGNORE: diff --git a/engines/sci/graphics/paint16.cpp b/engines/sci/graphics/paint16.cpp index 53449fbeb4..aac922d278 100644 --- a/engines/sci/graphics/paint16.cpp +++ b/engines/sci/graphics/paint16.cpp @@ -544,9 +544,7 @@ reg_t GfxPaint16::kernelDisplay(const char *text, uint16 languageSplitter, int a SciCallOrigin originReply; SciWorkaroundSolution solution = trackOriginAndFindWorkaround(0, kDisplay_workarounds, &originReply); if (solution.type == WORKAROUND_NONE) - error("Unknown kDisplay argument (%04x:%04x) from method %s::%s (script %d, localCall %x)", - PRINT_REG(displayArg), originReply.objectName.c_str(), originReply.methodName.c_str(), - originReply.scriptNr, originReply.localCallOffset); + error("Unknown kDisplay argument (%04x:%04x) from %s", PRINT_REG(displayArg), originReply.toString().c_str()); assert(solution.type == WORKAROUND_IGNORE); break; } |