[Gemrb-commits] gemrb: branch master updated. v0.7.0-535-ga3becfe

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

gemrb: Infinity Engine emulator

The branch master has been updated
       via  a3becfe459b46656fb3340d2d467ec28c3693037 (commit)

Summary of changes:
 gemrb/plugins/SDLVideo/SDL20Video.cpp |    6 +++---
 gemrb/plugins/SDLVideo/SDL20Video.h   |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
      from  0c4abb0efcacbd3c58bbd7a2e641c00931967e25 (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=a3becfe459b46656fb3340d2d467ec28c3693037

commit a3becfe459b46656fb3340d2d467ec28c3693037
Author: Brad Allred <bra...@me...>
Date:   Tue Mar 13 08:40:19 2012 -0600

    SDL20Video: use an ivar to keep firstFingerDownTime. Some older versions of SDL 1.3 don't have a timestamp member in the finger struct.

diff --git a/gemrb/plugins/SDLVideo/SDL20Video.cpp b/gemrb/plugins/SDLVideo/SDL20Video.cpp
index 3c19c29..c347541 100644
--- a/gemrb/plugins/SDLVideo/SDL20Video.cpp
+++ b/gemrb/plugins/SDLVideo/SDL20Video.cpp
@@ -230,8 +230,8 @@ int SDL20VideoDriver::SwapBuffers(void)
 
 int SDL20VideoDriver::PollEvents()
 {
-	if (firstFingerDown.timestamp
-		&& GetTickCount() - firstFingerDown.timestamp >= TOUCH_RC_NUM_TICKS) {
+	if (firstFigerDownTime
+		&& GetTickCount() - firstFigerDownTime >= TOUCH_RC_NUM_TICKS) {
 		// enough time has passed to transform firstTouch into a right click event
 		int x = firstFingerDown.x;
 		int y = firstFingerDown.y;
@@ -330,7 +330,7 @@ int SDL20VideoDriver::ProcessEvent(const SDL_Event & event)
 				}
 				// do not send a mouseDown event. we delay firstTouch until we know more about the context.
 				firstFingerDown = event.tfinger;
-				firstFingerDown.timestamp = GetTickCount();
+				firstFigerDownTime = GetTickCount();
 				firstFingerDown.x /= xScaleFactor;
 				firstFingerDown.y /= yScaleFactor;
 			} else if (EvntManager && numFingers == core->NumFingInfo) {
diff --git a/gemrb/plugins/SDLVideo/SDL20Video.h b/gemrb/plugins/SDLVideo/SDL20Video.h
index d6afaf8..dd56467 100644
--- a/gemrb/plugins/SDLVideo/SDL20Video.h
+++ b/gemrb/plugins/SDLVideo/SDL20Video.h
@@ -34,6 +34,7 @@ private:
 	// touch input vars
 	bool ignoreNextFingerUp;
 	SDL_TouchFingerEvent firstFingerDown;
+	unsigned long firstFigerDownTime;
 public:
 	SDL20VideoDriver(void);
 	~SDL20VideoDriver(void);

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


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