[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.80,1.81 intro.cpp,1.51,1.52 mouse.cpp,1.36,1.37 sky.cpp,1.162,1.163

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26853/sky

Modified Files:
	control.cpp intro.cpp mouse.cpp sky.cpp 
Log Message:
Clean up OSystem::Event

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- control.cpp	27 Nov 2004 00:26:00 -0000	1.80
+++ control.cpp	5 Dec 2004 17:42:19 -0000	1.81
@@ -1686,7 +1686,7 @@
 
 	do {
 		while (_system->pollEvent(event)) {
-			switch (event.event_code) {
+			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				// Make sure backspace works right (this fixes a small issue on OS X)
 				if (event.kbd.keycode == 8)

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- intro.cpp	11 Nov 2004 10:14:35 -0000	1.51
+++ intro.cpp	5 Dec 2004 17:42:19 -0000	1.52
@@ -898,10 +898,10 @@
 	int32 nDelay = 0;
 	do {
 		while (_system->pollEvent(event)) {
-			if (event.event_code == OSystem::EVENT_KEYDOWN) {
+			if (event.type == OSystem::EVENT_KEYDOWN) {
 				if (event.kbd.keycode == 27)
 					return false;
-			} else if (event.event_code == OSystem::EVENT_QUIT) {
+			} else if (event.type == OSystem::EVENT_QUIT) {
 				_quitProg = true;
 				return false;
 			}

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- mouse.cpp	11 Nov 2004 10:14:35 -0000	1.36
+++ mouse.cpp	5 Dec 2004 17:42:19 -0000	1.37
@@ -170,8 +170,8 @@
 	while (mousePressed) {
 		_system->delayMillis(20);
 		while (_system->pollEvent(event)) {
-			if ((event.event_code == OSystem::EVENT_LBUTTONUP) ||
-				(event.event_code == OSystem::EVENT_QUIT))
+			if ((event.type == OSystem::EVENT_LBUTTONUP) ||
+				(event.type == OSystem::EVENT_QUIT))
 				mousePressed = false;
 		}
 	}

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- sky.cpp	2 Dec 2004 00:33:41 -0000	1.162
+++ sky.cpp	5 Dec 2004 17:42:19 -0000	1.163
@@ -453,7 +453,7 @@
 
 	do {
 		while (_system->pollEvent(event)) {
-			switch (event.event_code) {
+			switch (event.type) {
 			case OSystem::EVENT_KEYDOWN:
 				if (event.kbd.flags == OSystem::KBD_CTRL) {
 					if (event.kbd.keycode == 'f') {