thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: kernelDeref*() functions are now seSegmentManager methods

Browse source 
svn-id: r44082
This commit is contained in:
Max Horn 2009-09-14 13:13:20 +00:00
parent c00edfb64f
commit 0e834d0b87
12 changed files with 156 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/sci/engine/kmisc.cpp
View file

@ -187,8 +187,8 @@ reg_t kMemory(EngineState *s, int, int argc, reg_t *argv) {
break;
case K_MEMORY_MEMCPY : {
int size = argv[3].toUint16();
byte *dest = kernelDerefBulkPtr(s->segMan, argv[1], size);
byte *src = kernelDerefBulkPtr(s->segMan, argv[2], size);
byte *dest = s->segMan->kernelDerefBulkPtr(argv[1], size);
byte *src = s->segMan->kernelDerefBulkPtr(argv[2], size);
if (dest && src)
memcpy(dest, src, size);
@ -204,7 +204,7 @@ reg_t kMemory(EngineState *s, int, int argc, reg_t *argv) {
break;
}
case K_MEMORY_PEEK : {
byte *ref = kernelDerefBulkPtr(s->segMan, argv[1], 2);
byte *ref = s->segMan->kernelDerefBulkPtr(argv[1], 2);
if (!ref) {
// This occurs in KQ5CD when interacting with certain objects
@ -218,7 +218,7 @@ reg_t kMemory(EngineState *s, int, int argc, reg_t *argv) {
break;
}
case K_MEMORY_POKE : {
byte *ref = kernelDerefBulkPtr(s->segMan, argv[1], 2);
byte *ref = s->segMan->kernelDerefBulkPtr(argv[1], 2);
if (!ref) {
warning("Attempt to poke invalid memory at %04x:%04x", PRINT_REG(argv[1]));