From: Holger Schemel <info@artsoft.org>
Date: Sun, 4 Oct 2020 22:52:23 +0000 (+0200)
Subject: moved code for setting touch info for finger events to separate function
X-Git-Tag: 4.2.0.3~8
X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=commitdiff_plain;h=9d23eac9de03f91cf0ac094786ab30cdd589ac49

moved code for setting touch info for finger events to separate function
---

diff --git a/src/events.c b/src/events.c
index f4311bfd..41b60832 100644
--- a/src/events.c
+++ b/src/events.c
@@ -698,6 +698,16 @@ static struct
   byte action;
 } touch_info[NUM_TOUCH_FINGERS];
 
+static void SetTouchInfo(int pos, SDL_FingerID finger_id, int counter,
+			 Key key, byte action)
+{
+  touch_info[pos].touched = (action != JOY_NO_ACTION);
+  touch_info[pos].finger_id = finger_id;
+  touch_info[pos].counter = counter;
+  touch_info[pos].key = key;
+  touch_info[pos].action = action;
+}
+
 static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 {
   int x = event->x * overlay.grid_xsize;
@@ -807,11 +817,7 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 	}
       }
 
-      touch_info[i].touched = TRUE;
-      touch_info[i].finger_id = event->fingerId;
-      touch_info[i].counter = Counter();
-      touch_info[i].key = key;
-      touch_info[i].action = grid_button_action;
+      SetTouchInfo(i, event->fingerId, Counter(), key, grid_button_action);
     }
     else
     {
@@ -823,11 +829,7 @@ static void HandleFingerEvent_VirtualButtons(FingerEvent *event)
 	      getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i);
       }
 
-      touch_info[i].touched = FALSE;
-      touch_info[i].finger_id = 0;
-      touch_info[i].counter = 0;
-      touch_info[i].key = 0;
-      touch_info[i].action = JOY_NO_ACTION;
+      SetTouchInfo(i, 0, 0, 0, JOY_NO_ACTION);
     }
   }
 }