[Scummvm-cvs-logs] SF.net SVN: scummvm:[34215] scummvm/trunk/engines/tinsel

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Aug 31 00:17:00 CEST 2008


Revision: 34215
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34215&view=rev
Author:   fingolfin
Date:     2008-08-30 22:16:59 +0000 (Sat, 30 Aug 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/tinsel/cursor.cpp
    scummvm/trunk/engines/tinsel/tinsel.h

Modified: scummvm/trunk/engines/tinsel/cursor.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/cursor.cpp	2008-08-30 22:10:48 UTC (rev 34214)
+++ scummvm/trunk/engines/tinsel/cursor.cpp	2008-08-30 22:16:59 UTC (rev 34215)
@@ -49,7 +49,7 @@
 //----------------- LOCAL DEFINES --------------------
 
 #define ITERATION_BASE		FRAC_ONE
-#define ITER_ACCELLERATION	(10L << (FRAC_BITS - 4))
+#define ITER_ACCELERATION	(10L << (FRAC_BITS - 4))
 
 
 //----------------- LOCAL GLOBAL DATA --------------------
@@ -404,7 +404,8 @@
 	newY = intToFrac(ptMouse.y);
 
 	// modify mouse driver position depending on cursor keys
-	if ((dir = _vm->getKeyDirection()) != 0) {
+	dir = _vm->getKeyDirection();
+	if (dir != 0) {
 		if (dir & MSK_LEFT)
 			newX -= IterationSize;
 
@@ -417,7 +418,7 @@
 		if (dir & MSK_DOWN)
 			newY += IterationSize;
 
-		IterationSize += ITER_ACCELLERATION;
+		IterationSize += ITER_ACCELERATION;
 
 		// set new mouse driver position
 		_vm->setMousePosition(Common::Point(fracToInt(newX), fracToInt(newY)));

Modified: scummvm/trunk/engines/tinsel/tinsel.h
===================================================================
--- scummvm/trunk/engines/tinsel/tinsel.h	2008-08-30 22:10:48 UTC (rev 34214)
+++ scummvm/trunk/engines/tinsel/tinsel.h	2008-08-30 22:16:59 UTC (rev 34215)
@@ -79,7 +79,7 @@
 
 typedef bool (*KEYFPTR)(const Common::KeyState &);
 
-class TinselEngine : public ::Engine {
+class TinselEngine : public Engine {
 	int _gameId;
 	Common::KeyState _keyPressed;
 	Common::RandomSource _random;


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




More information about the Scummvm-git-logs mailing list