[Scummvm-cvs-logs] SF.net SVN: scummvm: [27513] scummvm/trunk/engines/saga

[sev at users.sourceforge.net]

Revision: 27513
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27513&view=rev
Author:   sev
Date:     2007-06-17 09:21:05 -0700 (Sun, 17 Jun 2007)

Log Message:
-----------
Normalize event names.

Modified Paths:
--------------
    scummvm/trunk/engines/saga/animation.cpp
    scummvm/trunk/engines/saga/events.cpp
    scummvm/trunk/engines/saga/events.h

Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp	2007-06-17 15:45:09 UTC (rev 27512)
+++ scummvm/trunk/engines/saga/animation.cpp	2007-06-17 16:21:05 UTC (rev 27513)
@@ -245,7 +245,7 @@
 		// 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 @@
 		// Draw the scene
 		event.type = kEvTImmediate;
 		event.code = kSceneEvent;
-		event.op = kEventDrawScene;
+		event.op = kEventDraw;
 		event.time = 0;
 		event.duration = 0;
 

Modified: scummvm/trunk/engines/saga/events.cpp
===================================================================
--- scummvm/trunk/engines/saga/events.cpp	2007-06-17 15:45:09 UTC (rev 27512)
+++ scummvm/trunk/engines/saga/events.cpp	2007-06-17 16:21:05 UTC (rev 27513)
@@ -369,7 +369,7 @@
 		break;
 	case kSceneEvent:
 		switch (event->op) {
-		case kEventDrawScene:
+		case kEventDraw:
 			{
 				Surface *backGroundSurface;
 				BGInfo bgInfo;
@@ -491,7 +491,7 @@
 		}
 	case kCutawayEvent:
 		switch (event->op) {
-		case kEventClearCutaway:
+		case kEventClear:
 			_vm->_anim->clearCutaway();
 			break;
 		default:

Modified: scummvm/trunk/engines/saga/events.h
===================================================================
--- scummvm/trunk/engines/saga/events.h	2007-06-17 15:45:09 UTC (rev 27512)
+++ scummvm/trunk/engines/saga/events.h	2007-06-17 16:21:05 UTC (rev 27513)
@@ -78,7 +78,7 @@
 	kEventPlay = 1,
 	kEventStop = 2,
 	// SCENE events
-	kEventDrawScene = 1,
+	kEventDraw = 1,
 	kEventEnd = 2,
 	// TEXT events
 	kEventHide = 2,
@@ -116,7 +116,7 @@
 	kEventDissolve = 1,
 	kEventDissolveBGMask = 2,
 	// CUTAWAY events
-	kEventClearCutaway = 1
+	kEventClear = 1
 };
 
 enum EventParams {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.