[Scummvm-cvs-logs] CVS: scummvm/backends/morphos morphos.cpp,1.42,1.43

[Max Horn]

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

Modified Files:
	morphos.cpp 
Log Message:
Clean up OSystem::Event

Index: morphos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/morphos/morphos.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- morphos.cpp	28 Sep 2004 20:19:22 -0000	1.42
+++ morphos.cpp	5 Dec 2004 17:42:16 -0000	1.43
@@ -825,7 +825,7 @@
 					qual |= KBD_CTRL;
 				event.kbd.flags = qual;
 
-				event.event_code = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN;
+				event.type = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN;
 				ScummMsg->Code &= ~IECODE_UP_PREFIX;
 
 				if (ScummMsg->Code >= RAWKEY_F1 && ScummMsg->Code <= RAWKEY_F10)
@@ -849,13 +849,13 @@
 					/*
 					 * Wheelmouse event
 					 */
-					event.event_code = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN;
+					event.type = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN;
 				}
 				else if (MapRawKey(&FakedIEvent, &charbuf, 1, NULL) == 1)
 				{
 					if (qual == KBD_CTRL && charbuf == 'z')
 					{
-						event.event_code = EVENT_QUIT;
+						event.type = EVENT_QUIT;
 						break;
 					}
 					else if (qual == KBD_ALT)
@@ -870,7 +870,7 @@
 						}
 						else if (charbuf == 'x')
 						{
-							event.event_code = EVENT_QUIT;
+							event.type = EVENT_QUIT;
 							break;
 						}
 						else if (charbuf == 0x0d)
@@ -915,7 +915,7 @@
 				else if (FullScreenMode)
 					newy = newy <? (ScummScrHeight >> ScummScale)-2;
 
-				event.event_code = EVENT_MOUSEMOVE;
+				event.type = EVENT_MOUSEMOVE;
 				event.mouse.x = newx;
 				event.mouse.y = newy;
 				set_mouse_pos(event.mouse.x, event.mouse.y);
@@ -932,19 +932,19 @@
 				switch (ScummMsg->Code)
 				{
 					case SELECTDOWN:
-						event.event_code = EVENT_LBUTTONDOWN;
+						event.type = EVENT_LBUTTONDOWN;
 						break;
 
 					case SELECTUP:
-						event.event_code = EVENT_LBUTTONUP;
+						event.type = EVENT_LBUTTONUP;
 						break;
 
 					case MENUDOWN:
-						event.event_code = EVENT_RBUTTONDOWN;
+						event.type = EVENT_RBUTTONDOWN;
 						break;
 
 					case MENUUP:
-						event.event_code = EVENT_RBUTTONUP;
+						event.type = EVENT_RBUTTONUP;
 						break;
 
 					default:
@@ -957,7 +957,7 @@
 			}
 
 			case IDCMP_CLOSEWINDOW:
-				event.event_code = EVENT_QUIT;
+				event.type = EVENT_QUIT;
 				break;
 		}