[Gemrb-commits] gemrb: branch master updated. v0.6.6-149-gc5d6be6

[Brad A. <br...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c5d6be60d65b596b37ce27eb1a02a2b7612163e2 (commit)

Summary of changes:
 gemrb/plugins/SDLVideo/SDLVideo.cpp |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
      from  7e3e05e06ae4284435d1ffb287ed1b569cb0fb06 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c5d6be60d65b596b37ce27eb1a02a2b7612163e2

commit c5d6be60d65b596b37ce27eb1a02a2b7612163e2
Author: Brad Allred <bra...@me...>
Date:   Fri Nov 25 10:30:26 2011 -0700

    SDLVideo: ignore mousewheel button up events for SDL 1.3 too.

diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index eafbcae..6ba63c0 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -485,6 +485,10 @@ int SDLVideoDriver::PollEvents() {
 			break;
 
 		case SDL_MOUSEBUTTONUP:
+			// exclude mousewheel buttons on SDL 1.3+ otherwise we get a double scroll due to SDL_MOUSEWHEEL.
+#if SDL_VERSION_ATLEAST(1,3,0)
+			if (event.button.button == SDL_BUTTON_WHEELDOWN || event.button.button == SDL_BUTTON_WHEELUP) break;
+#endif
 			lastevent = false;
 			if ((DisableMouse & MOUSE_DISABLED) || !Evnt || ignoreNextMouseUp)
 				break;

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator