diff options
author | Eugene Sandulenko | 2007-06-17 16:21:05 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2007-06-17 16:21:05 +0000 |
commit | e477ca37b314bf40cd360840985cef2bf605f735 (patch) | |
tree | 0c21dcfc23e0f885b9735c2bec4bf316f0ea7f99 /engines/saga | |
parent | 6dc0a1b234e4395d42dc3d73da098fe0ca355a27 (diff) | |
download | scummvm-rg350-e477ca37b314bf40cd360840985cef2bf605f735.tar.gz scummvm-rg350-e477ca37b314bf40cd360840985cef2bf605f735.tar.bz2 scummvm-rg350-e477ca37b314bf40cd360840985cef2bf605f735.zip |
Normalize event names.
svn-id: r27513
Diffstat (limited to 'engines/saga')
-rw-r--r-- | engines/saga/animation.cpp | 4 | ||||
-rw-r--r-- | engines/saga/events.cpp | 4 | ||||
-rw-r--r-- | engines/saga/events.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/saga/animation.cpp b/engines/saga/animation.cpp index b0056dc7c6..6631df4d00 100644 --- a/engines/saga/animation.cpp +++ b/engines/saga/animation.cpp @@ -245,7 +245,7 @@ void Anim::returnFromCutaway(void) { // Clear the cutaway. Note that this sets _cutawayActive to false event.type = kEvTImmediate; event.code = kCutawayEvent; - event.op = kEventClearCutaway; + event.op = kEventClear; event.time = 0; event.duration = 0; @@ -268,7 +268,7 @@ void Anim::returnFromCutaway(void) { // Draw the scene event.type = kEvTImmediate; event.code = kSceneEvent; - event.op = kEventDrawScene; + event.op = kEventDraw; event.time = 0; event.duration = 0; diff --git a/engines/saga/events.cpp b/engines/saga/events.cpp index d9a2131c0b..191ea4ed61 100644 --- a/engines/saga/events.cpp +++ b/engines/saga/events.cpp @@ -369,7 +369,7 @@ int Events::handleOneShot(Event *event) { break; case kSceneEvent: switch (event->op) { - case kEventDrawScene: + case kEventDraw: { Surface *backGroundSurface; BGInfo bgInfo; @@ -491,7 +491,7 @@ int Events::handleOneShot(Event *event) { } case kCutawayEvent: switch (event->op) { - case kEventClearCutaway: + case kEventClear: _vm->_anim->clearCutaway(); break; default: diff --git a/engines/saga/events.h b/engines/saga/events.h index 2f8cf46ffb..d0af1fe916 100644 --- a/engines/saga/events.h +++ b/engines/saga/events.h @@ -78,7 +78,7 @@ enum EventOps { kEventPlay = 1, kEventStop = 2, // SCENE events - kEventDrawScene = 1, + kEventDraw = 1, kEventEnd = 2, // TEXT events kEventHide = 2, @@ -116,7 +116,7 @@ enum EventOps { kEventDissolve = 1, kEventDissolveBGMask = 2, // CUTAWAY events - kEventClearCutaway = 1 + kEventClear = 1 }; enum EventParams { |