diff options
author | Max Horn | 2010-02-13 17:44:19 +0000 |
---|---|---|
committer | Max Horn | 2010-02-13 17:44:19 +0000 |
commit | a82939c9bee20f2969f1006c1c9a836cea5c7903 (patch) | |
tree | 1d09caf84f1b1d7787b539952cd739f66383c68d /engines/sci/engine/kscripts.cpp | |
parent | 721a57a66101d63bc05e294c24190ba66ccceb74 (diff) | |
download | scummvm-rg350-a82939c9bee20f2969f1006c1c9a836cea5c7903.tar.gz scummvm-rg350-a82939c9bee20f2969f1006c1c9a836cea5c7903.tar.bz2 scummvm-rg350-a82939c9bee20f2969f1006c1c9a836cea5c7903.zip |
SCI: Get rid of EngineState::resMan
svn-id: r48048
Diffstat (limited to 'engines/sci/engine/kscripts.cpp')
-rw-r--r-- | engines/sci/engine/kscripts.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp index 1fca13cb44..945a63459b 100644 --- a/engines/sci/engine/kscripts.cpp +++ b/engines/sci/engine/kscripts.cpp @@ -54,13 +54,13 @@ reg_t kLock(EngineState *s, int argc, reg_t *argv) { switch (state) { case 1 : - s->resMan->findResource(id, 1); + g_sci->getResMan()->findResource(id, 1); break; case 0 : - which = s->resMan->findResource(id, 0); + which = g_sci->getResMan()->findResource(id, 0); if (which) - s->resMan->unlockResource(which); + g_sci->getResMan()->unlockResource(which); else { if (id.type == kResourceTypeInvalid) warning("[resMan] Attempt to unlock resource %i of invalid type %i", id.number, type); @@ -101,10 +101,10 @@ reg_t kResCheck(EngineState *s, int argc, reg_t *argv) { uint cond = argv[4].toUint16() & 0xff; uint seq = argv[5].toUint16() & 0xff; - res = s->resMan->testResource(ResourceId(restype, argv[1].toUint16(), noun, verb, cond, seq)); + res = g_sci->getResMan()->testResource(ResourceId(restype, argv[1].toUint16(), noun, verb, cond, seq)); } } else { - res = s->resMan->testResource(ResourceId(restype, argv[1].toUint16())); + res = g_sci->getResMan()->testResource(ResourceId(restype, argv[1].toUint16())); } return make_reg(0, res != NULL); |