[Scummvm-cvs-logs] scummvm master -> 3e3619feb87c9b63a0dae08c2dd29ed43dc1bc82

dhewg dhewg at wiibrew.org
Fri Mar 18 22:15:37 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3e3619feb8 ANDROID: Cleanup


Commit: 3e3619feb87c9b63a0dae08c2dd29ed43dc1bc82
    https://github.com/scummvm/scummvm/commit/3e3619feb87c9b63a0dae08c2dd29ed43dc1bc82
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-03-18T14:14:54-07:00

Commit Message:
ANDROID: Cleanup

Changed paths:
    backends/platform/android/events.cpp



diff --git a/backends/platform/android/events.cpp b/backends/platform/android/events.cpp
index 2f60492..5fc10b2 100644
--- a/backends/platform/android/events.cpp
+++ b/backends/platform/android/events.cpp
@@ -381,14 +381,14 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 		case JKEYCODE_DPAD_DOWN:
 		case JKEYCODE_DPAD_LEFT:
 		case JKEYCODE_DPAD_RIGHT:
-			{
-				if (arg1 != JACTION_DOWN)
-					return;
+			if (arg1 != JACTION_DOWN)
+				return;
 
-				e.type = Common::EVENT_MOUSEMOVE;
+			e.type = Common::EVENT_MOUSEMOVE;
 
-				e.mouse = getEventManager()->getMousePos();
+			e.mouse = getEventManager()->getMousePos();
 
+			{
 				int16 *c;
 				int s;
 
@@ -408,13 +408,13 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 					*c -= f;
 				else
 					*c += f;
+			}
 
-				clipMouse(e.mouse);
+			clipMouse(e.mouse);
 
-				lockMutex(_event_queue_lock);
-				_event_queue.push(e);
-				unlockMutex(_event_queue_lock);
-			}
+			lockMutex(_event_queue_lock);
+			_event_queue.push(e);
+			unlockMutex(_event_queue_lock);
 
 			return;
 
@@ -431,15 +431,11 @@ void OSystem_Android::pushEvent(int type, int arg1, int arg2, int arg3,
 				return;
 			}
 
-			{
-				const Common::Point &m = getEventManager()->getMousePos();
-
-				e.mouse = m;
+			e.mouse = getEventManager()->getMousePos();
 
-				lockMutex(_event_queue_lock);
-				_event_queue.push(e);
-				unlockMutex(_event_queue_lock);
-			}
+			lockMutex(_event_queue_lock);
+			_event_queue.push(e);
+			unlockMutex(_event_queue_lock);
 
 			return;
 		}






More information about the Scummvm-git-logs mailing list