[freedroidrpg] 13/32: Updated d/patches/20_enter_keys.diff

[Julien Puydt]

This is an automated email from the git hooks/post-receive script.

jpuydt-guest pushed a commit to branch master
in repository freedroidrpg.

commit 1be7243ca76d8a7f4da66860367439ee7abed4a6
Author: Julien Puydt <julien.puydt at laposte.net>
Date:   Thu Nov 10 16:24:45 2016 +0100

    Updated d/patches/20_enter_keys.diff
---
 debian/changelog                  |  1 +
 debian/patches/20_enter_keys.diff | 35 +++++++++++++----------------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc07b8b..cb338cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ freedroidrpg (0.16.1-1) UNRELEASED; urgency=medium
   * Updated dh compat to 10.
   * Updated debian/patches/07_framerate.diff.
   * Updated debian/patches/17_debianize.diff.
+  * Updated debian/patches/20_enter_keys.diff.
 
  -- Julien Puydt <julien.puydt at laposte.net>  Thu, 10 Nov 2016 09:10:23 +0100
 
diff --git a/debian/patches/20_enter_keys.diff b/debian/patches/20_enter_keys.diff
index 72d44c6..463ce8d 100644
--- a/debian/patches/20_enter_keys.diff
+++ b/debian/patches/20_enter_keys.diff
@@ -1,30 +1,21 @@
-Index: freedroidrpg-0.15.1/src/input.c
-===================================================================
---- freedroidrpg-0.15.1.orig/src/input.c	2012-05-05 12:49:57.000000000 +0000
-+++ freedroidrpg-0.15.1/src/input.c	2012-05-05 12:50:28.000000000 +0000
-@@ -192,7 +192,7 @@
+Author: Bart Martens
+Description: Fixes enter key on some keyboards
+Forwarded: no
+
+--- a/src/input.c
++++ b/src/input.c
+@@ -189,7 +189,7 @@
+ 
  int EnterPressed()
  {
- 	SDL_PumpEvents();
--	return ((key_state_array[SDLK_RETURN]));
-+	return ((key_state_array[SDLK_RETURN] || key_state_array[SDLK_KP_ENTER]));
+-	return key_is_pressed(SDLK_RETURN);
++	return key_is_pressed(SDLK_RETURN) || key_is_pressed(SDLK_KP_ENTER);
  }
  
  int EscapePressed()
-Index: freedroidrpg-0.15.1/src/text.c
-===================================================================
---- freedroidrpg-0.15.1.orig/src/text.c	2012-05-05 12:49:57.000000000 +0000
-+++ freedroidrpg-0.15.1/src/text.c	2012-05-05 12:50:28.000000000 +0000
-@@ -179,7 +179,7 @@
- 			Terminate(EXIT_SUCCESS, TRUE);
- 			break;
- 		case SDL_KEYDOWN:
--			if (e.key.keysym.sym == SDLK_SPACE || e.key.keysym.sym == SDLK_RETURN || e.key.keysym.sym == SDLK_ESCAPE)
-+			if (e.key.keysym.sym == SDLK_SPACE || e.key.keysym.sym == SDLK_RETURN || e.key.keysym.sym == SDLK_KP_ENTER || e.key.keysym.sym == SDLK_ESCAPE)
- 				goto wait_click_and_out;
- 			break;
- 		case SDL_MOUSEBUTTONDOWN:
-@@ -608,7 +608,7 @@
+--- a/src/text.c
++++ b/src/text.c
+@@ -597,7 +597,7 @@
  
  		key = getchar_raw(NULL);
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freedroidrpg.git