From: Holger Schemel <info@artsoft.org>
Date: Wed, 18 Sep 2019 20:50:27 +0000 (+0200)
Subject: moved code to separate function
X-Git-Tag: 4.1.4.0~18
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=519124736d97d1e9042eb4713dc23e1a543e3dd4;p=rocksndiamonds.git

moved code to separate function
---

diff --git a/src/events.c b/src/events.c
index 6066335d..073e0db8 100644
--- a/src/events.c
+++ b/src/events.c
@@ -466,6 +466,17 @@ static void SetPlayerMouseAction(int mx, int my, int button)
   SetTileCursorXY(lx, ly);
 }
 
+static Key GetKeyFromGridButton(int grid_button)
+{
+  return (grid_button == CHAR_GRID_BUTTON_LEFT  ? setup.input[0].key.left :
+	  grid_button == CHAR_GRID_BUTTON_RIGHT ? setup.input[0].key.right :
+	  grid_button == CHAR_GRID_BUTTON_UP    ? setup.input[0].key.up :
+	  grid_button == CHAR_GRID_BUTTON_DOWN  ? setup.input[0].key.down :
+	  grid_button == CHAR_GRID_BUTTON_SNAP  ? setup.input[0].key.snap :
+	  grid_button == CHAR_GRID_BUTTON_DROP  ? setup.input[0].key.drop :
+	  KSYM_UNDEFINED);
+}
+
 void HandleButtonEvent(ButtonEvent *event)
 {
 #if DEBUG_EVENTS_BUTTON
@@ -669,13 +680,7 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
   int y = event->y * overlay.grid_ysize;
   int grid_button = overlay.grid_button[x][y];
   int grid_button_action = GET_ACTION_FROM_GRID_BUTTON(grid_button);
-  Key key = (grid_button == CHAR_GRID_BUTTON_LEFT  ? setup.input[0].key.left :
-	     grid_button == CHAR_GRID_BUTTON_RIGHT ? setup.input[0].key.right :
-	     grid_button == CHAR_GRID_BUTTON_UP    ? setup.input[0].key.up :
-	     grid_button == CHAR_GRID_BUTTON_DOWN  ? setup.input[0].key.down :
-	     grid_button == CHAR_GRID_BUTTON_SNAP  ? setup.input[0].key.snap :
-	     grid_button == CHAR_GRID_BUTTON_DROP  ? setup.input[0].key.drop :
-	     KSYM_UNDEFINED);
+  Key key = GetKeyFromGridButton(grid_button);
   int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED :
 		    KEY_PRESSED);
   char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" :