diff options
| author | Max Horn | 2004-10-17 19:40:34 +0000 |
|---|---|---|
| committer | Max Horn | 2004-10-17 19:40:34 +0000 |
| commit | ea9d53be79084ca212c5fca6b151f84ff1940647 (patch) | |
| tree | 64ae78ee4aef716616c31257ef17557d117cf098 | |
| parent | 42909eb0b03f569b789db9001b29e885f8adc1ad (diff) | |
| download | scummvm-rg350-ea9d53be79084ca212c5fca6b151f84ff1940647.tar.gz scummvm-rg350-ea9d53be79084ca212c5fca6b151f84ff1940647.tar.bz2 scummvm-rg350-ea9d53be79084ca212c5fca6b151f84ff1940647.zip | |
cleanup
svn-id: r15597
| -rw-r--r-- | gui/newgui.cpp | 3 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_bndmgr.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index ab9d91c8f1..4d9ec7f1b0 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -133,7 +133,7 @@ void NewGui::runLoop() { break; // We don't distinguish between mousebuttons (for now at least) case OSystem::EVENT_LBUTTONDOWN: - case OSystem::EVENT_RBUTTONDOWN: { + case OSystem::EVENT_RBUTTONDOWN: if (_lastClick.count && (time < _lastClick.time + kDoubleClickDelay) && ABS(_lastClick.x - event.mouse.x) < 3 && ABS(_lastClick.y - event.mouse.y) < 3) { @@ -144,7 +144,6 @@ void NewGui::runLoop() { _lastClick.count = 1; } _lastClick.time = time; - } activeDialog->handleMouseDown(event.mouse.x - activeDialog->_x, event.mouse.y - activeDialog->_y, 1, _lastClick.count); break; case OSystem::EVENT_LBUTTONUP: diff --git a/scumm/imuse_digi/dimuse_bndmgr.h b/scumm/imuse_digi/dimuse_bndmgr.h index da819493be..e279a14eb8 100644 --- a/scumm/imuse_digi/dimuse_bndmgr.h +++ b/scumm/imuse_digi/dimuse_bndmgr.h @@ -89,7 +89,7 @@ public: namespace BundleCodecs { -uint32 decode12BitsSample(byte *src, byte **dst, uint32 size); +uint32 decode12BitsSample(const byte *src, byte **dst, uint32 size); void initializeImcTables(); #ifdef __PALM_OS__ void releaseImcTables(); |