diff options
| author | Max Horn | 2008-08-30 22:16:59 +0000 |
|---|---|---|
| committer | Max Horn | 2008-08-30 22:16:59 +0000 |
| commit | 2c3f2829fa673c260172e8229a711735f101c0f7 (patch) | |
| tree | 591e9982ca79324063ba71c9a21c00d1e89fb470 | |
| parent | 4875b440527cd8d228ee80dcc9159bb95fb7a7d3 (diff) | |
| download | scummvm-rg350-2c3f2829fa673c260172e8229a711735f101c0f7.tar.gz scummvm-rg350-2c3f2829fa673c260172e8229a711735f101c0f7.tar.bz2 scummvm-rg350-2c3f2829fa673c260172e8229a711735f101c0f7.zip | |
cleanup
svn-id: r34215
| -rw-r--r-- | engines/tinsel/cursor.cpp | 7 | ||||
| -rw-r--r-- | engines/tinsel/tinsel.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/engines/tinsel/cursor.cpp b/engines/tinsel/cursor.cpp index b95662cbfe..f933b2dd79 100644 --- a/engines/tinsel/cursor.cpp +++ b/engines/tinsel/cursor.cpp @@ -49,7 +49,7 @@ namespace Tinsel { //----------------- 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 @@ static void MoveCursor(void) { 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 @@ static void MoveCursor(void) { 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))); diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index e1684e0087..de308864a6 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -79,7 +79,7 @@ enum TinselKeyDirection { typedef bool (*KEYFPTR)(const Common::KeyState &); -class TinselEngine : public ::Engine { +class TinselEngine : public Engine { int _gameId; Common::KeyState _keyPressed; Common::RandomSource _random; |