diff options
| author | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
| commit | 1bbab8f1915eebdb18365c64ec64eec2a8770bb6 (patch) | |
| tree | e7cbeca85155034e77ce1f1bbdbf645982b63182 /engines/sci/engine/kevent.cpp | |
| parent | b391f08b46c3f47e8631248fd70ee21ebe12b744 (diff) | |
| download | scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.gz scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.bz2 scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.zip | |
Some renaming:
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan
svn-id: r43908
Diffstat (limited to 'engines/sci/engine/kevent.cpp')
| -rw-r--r-- | engines/sci/engine/kevent.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp index 86755c90fa..7bb9fdfa8c 100644 --- a/engines/sci/engine/kevent.cpp +++ b/engines/sci/engine/kevent.cpp @@ -40,8 +40,8 @@ reg_t kGetEvent(EngineState *s, int, int argc, reg_t *argv) { reg_t obj = argv[1]; sci_event_t e; int oldx, oldy; - int modifier_mask = s->resourceManager->sciVersion() <= SCI_VERSION_01 ? SCI_EVM_ALL : SCI_EVM_NO_FOOLOCK; - SegManager *segManager = s->segmentManager; + int modifier_mask = s->resMan->sciVersion() <= SCI_VERSION_01 ? SCI_EVM_ALL : SCI_EVM_NO_FOOLOCK; + SegManager *segManager = s->segMan; // If there's a simkey pending, and the game wants a keyboard event, use the // simkey instead of a normal event @@ -153,7 +153,7 @@ reg_t kGetEvent(EngineState *s, int, int argc, reg_t *argv) { reg_t kMapKeyToDir(EngineState *s, int, int argc, reg_t *argv) { reg_t obj = argv[0]; - SegManager *segManager = s->segmentManager; + SegManager *segManager = s->segMan; if (GET_SEL32V(obj, type) == SCI_EVT_KEYBOARD) { // Keyboard int mover = -1; @@ -203,7 +203,7 @@ reg_t kMapKeyToDir(EngineState *s, int, int argc, reg_t *argv) { reg_t kGlobalToLocal(EngineState *s, int, int argc, reg_t *argv) { reg_t obj = argc ? argv[0] : NULL_REG; // Can this really happen? Lars - SegManager *segManager = s->segmentManager; + SegManager *segManager = s->segMan; if (obj.segment) { int x = GET_SEL32V(obj, x); @@ -219,7 +219,7 @@ reg_t kGlobalToLocal(EngineState *s, int, int argc, reg_t *argv) { reg_t kLocalToGlobal(EngineState *s, int, int argc, reg_t *argv) { reg_t obj = argc ? argv[0] : NULL_REG; // Can this really happen? Lars - SegManager *segManager = s->segmentManager; + SegManager *segManager = s->segMan; if (obj.segment) { int x = GET_SEL32V(obj, x); |