aboutsummaryrefslogtreecommitdiff
path: root/scumm/script.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scumm/script.cpp')
-rw-r--r--scumm/script.cpp17
1 files changed, 4 insertions, 13 deletions
diff --git a/scumm/script.cpp b/scumm/script.cpp
index 07d138d4b7..9e2716b801 100644
--- a/scumm/script.cpp
+++ b/scumm/script.cpp
@@ -1056,20 +1056,11 @@ bool ScummEngine::isRoomScriptRunning(int script) const {
return false;
}
-int ScummEngine::copyScriptString(byte *dst, bool override) {
- int len, i = 0;
- if (_heversion >= 72 && (pop() == -1 || override)) {
- len = resStrLen(_stringBuffer) + 1;
- while (len--)
- *dst++ = _stringBuffer[i++];
- } else {
- len = resStrLen(_scriptPointer) + 1;
- while (len--)
- *dst++ = fetchScriptByte();
- }
+void ScummEngine::copyScriptString(byte *dst) {
+ int len = resStrLen(_scriptPointer) + 1;
+ while (len--)
+ *dst++ = fetchScriptByte();
*dst = 0;
-
- return len;
}
//