ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

PRINCE: Fix display of multiple phrases (#3298)

Browse Source 
When examining an object, if the description has multiple phrases, only the first one was displayed on the screen (but speech audio continues).
Thant's because multiple phrases are encoded in the same string using '\0' separator, so strcpy/strncpy should be avoided.
This commit is contained in:
aviloria
2021-08-21 22:29:11 +03:00
committed by GitHub
parent 7f886d51e1
commit 9a09449e88
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/prince/script.cpp
+5 -1
View File
@@ -1025,7 +1025,11 @@ void Interpreter::O_GETMOBTEXT() {
int32 mob = readScriptFlagValue();
debugInterpreter("O_GETMOBTEXT mob %d", mob);
_currentString = _vm->_locationNr * 100 + mob + 60001;
strncpy((char *)_stringBuf, _vm->_mobList[mob]._examText.c_str(), 1023);
// Use memcpy() instead of strncpy() because the examination text can contain
// different phrases separated by '\0' characters, followed by an ID.
// The examination text ends for a mob if the ID is 0xFF.
// Strings are properly extracted by the interpreter in that format.
memcpy((char *)_stringBuf, _vm->_mobList[mob]._examText.c_str(), 1023);
_string = _stringBuf;
}