[Gemrb-commits] gemrb: branch master updated. v0.6.6-158-g6992718

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  699271890864d7f548d5a6092865d820d29b79ce (commit)

Summary of changes:
 gemrb/plugins/SDLVideo/SDLVideo.cpp |    2 +-
 gemrb/plugins/SDLVideo/SDLVideo.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
      from  411561934ed30dbf6647fd5af0c30cf131170ac0 (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=699271890864d7f548d5a6092865d820d29b79ce

commit 699271890864d7f548d5a6092865d820d29b79ce
Author: Brad Allred <bra...@me...>
Date:   Sat Nov 26 16:23:11 2011 -0700

    SDLVideo: use an SDL event type for compatibility between SDL versions.

diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index 9662619..c06606a 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -2630,7 +2630,7 @@ void SDLVideoDriver::ClickMouse(unsigned int button)
 	}
 }
 
-void SDLVideoDriver::MouseClickEvent(Uint8 type, Uint8 button)
+void SDLVideoDriver::MouseClickEvent(SDL_EventType type, Uint8 button)
 {
 	SDL_Event *event = new SDL_Event();
 	event->type = type;
diff --git a/gemrb/plugins/SDLVideo/SDLVideo.h b/gemrb/plugins/SDLVideo/SDLVideo.h
index b93a7e2..442809c 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.h
+++ b/gemrb/plugins/SDLVideo/SDLVideo.h
@@ -74,7 +74,7 @@ public:
 	void MouseMovement(int x, int y);
 	void MoveMouse(unsigned int x, unsigned int y);
 	void ClickMouse(unsigned int button);
-	void MouseClickEvent(Uint8 type, Uint8 button);
+	void MouseClickEvent(SDL_EventType type, Uint8 button);
 	Sprite2D* CreateSprite(int w, int h, int bpp, ieDword rMask,
 		ieDword gMask, ieDword bMask, ieDword aMask, void* pixels,
 		bool cK = false, int index = 0);

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


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