aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kevent.cpp
diff options
context:
space:
mode:
authorMax Horn2009-09-06 12:57:42 +0000
committerMax Horn2009-09-06 12:57:42 +0000
commitd04b5d2c9b46c1bf0ad8a7b93981eae301163cb3 (patch)
tree6dd83b676d66a3653e3d8d684f95175e363acae1 /engines/sci/engine/kevent.cpp
parentc0ff500b0a1a1595f2f88583c925758039e9b64c (diff)
downloadscummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.gz
scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.tar.bz2
scummvm-rg350-d04b5d2c9b46c1bf0ad8a7b93981eae301163cb3.zip
SCI: Rename resManager -> resMan; segManager -> segMan
svn-id: r43980
Diffstat (limited to 'engines/sci/engine/kevent.cpp')
-rw-r--r--engines/sci/engine/kevent.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index 7bb9fdfa8c..dc8ee6d296 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -41,7 +41,7 @@ reg_t kGetEvent(EngineState *s, int, int argc, reg_t *argv) {
sci_event_t e;
int oldx, oldy;
int modifier_mask = s->resMan->sciVersion() <= SCI_VERSION_01 ? SCI_EVM_ALL : SCI_EVM_NO_FOOLOCK;
- SegManager *segManager = s->segMan;
+ SegManager *segMan = 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->segMan;
+ SegManager *segMan = 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->segMan;
+ SegManager *segMan = 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->segMan;
+ SegManager *segMan = s->segMan;
if (obj.segment) {
int x = GET_SEL32V(obj, x);