libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 20:59:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: Fix regression in r44081 breaking walking in QfG2

Browse Source 
svn-id: r44383
This commit is contained in:
Willem Jan Palenstijn 2009-09-26 22:55:24 +00:00
parent a49da8381b
commit be0b1e060b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/sci/engine/kstring.cpp
View File

@ -352,7 +352,7 @@ static int is_print_str(const char *str) {
reg_t kStrAt(EngineState *s, int, int argc, reg_t *argv) {
char *dest = s->segMan->derefString(argv[0]);
byte *dest = (byte*)s->segMan->derefString(argv[0]);
reg_t *dest2;
if (!dest) {
@ -370,7 +370,8 @@ reg_t kStrAt(EngineState *s, int, int argc, reg_t *argv) {
if ((argc == 2) &&
/* Our pathfinder already works around the issue we're trying to fix */
(strcmp(s->segMan->getDescription(argv[0]), AVOIDPATH_DYNMEM_STRING) != 0) &&
((strlen(dest) < 2) || (!lsl5PasswordWorkaround && !is_print_str(dest)))) {
((strlen((const char*)dest) < 2) ||
(!lsl5PasswordWorkaround && !is_print_str((const char*)dest)))) {
// SQ4 array handling detected
#ifndef SCUMM_BIG_ENDIAN
int odd = argv[1].toUint16() & 1;
@ -378,7 +379,7 @@ reg_t kStrAt(EngineState *s, int, int argc, reg_t *argv) {
int odd = !(argv[1].toUint16() & 1);
#endif
dest2 = ((reg_t *) dest) + (argv[1].toUint16() / 2);
dest = ((char *)(&dest2->offset)) + odd;
dest = ((byte *)(&dest2->offset)) + odd;
} else
dest += argv[1].toUint16();