libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-20 00:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Value is correct, but string index not array id.

Browse Source 
svn-id: r15233
This commit is contained in:
Travis Howell 2004-09-22 07:21:57 +00:00
parent 7389ca8884
commit 1c84b9fb50
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scumm/script_v8.cpp
View File

@ -1310,12 +1310,9 @@ void ScummEngine_v8::o8_kernelSetFunctions() {
break;
case 32: // writeRegistryValue
{
int array = args[1];
int idx = args[1];
int value = args[2];
// FIXME - hack: for some reasons the wrong variable ID arrives here, compared to the
// scripts. Probably a wrong push/pop somewhere. For now override to correct value.
array = 658;
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, idx);
debugC(DEBUG_GENERAL,"o8_kernelSetFunctions: writeRegistryValue(%s, %d)", (char *)ah->data, value);
}
@ -1412,11 +1409,8 @@ void ScummEngine_v8::o8_kernelGetFunctions() {
break;
case 0xE0: // readRegistryValue
{
int array = args[1];
// FIXME - hack: for some reasons the wrong variable ID arrives here, compared to the
// scripts. Probably a wrong push/pop somewhere. For now override to correct value.
array = 658;
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, readVar(array));
int idx = args[1];
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, idx);
if (!strcmp((char *)ah->data, "SFX Volume"))
push(ConfMan.getInt("sfx_volume") / 2);
else if (!strcmp((char *)ah->data, "Voice Volume"))