Replace screen_tapped with screen_down

TerryCavanagh · Aug 27, 2024 · 2bc2f31 · 2bc2f31
1 parent f75eaeb
commit 2bc2f31
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/desktop_version/src/Input.cpp b/desktop_version/src/Input.cpp
@@ -2386,7 +2386,7 @@ void titleinput(void)
         }
     }
     if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip)
-        || (!game.menustart ? touch::screen_tapped() : touch::button_tapped(TOUCH_BUTTON_CONFIRM)))
+        || (!game.menustart ? touch::screen_down() : touch::button_tapped(TOUCH_BUTTON_CONFIRM)))
     {
         game.press_action = true;
     }
@@ -2642,7 +2642,7 @@ void gameinput(void)
             game.press_action = false;
             if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v)
                 || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || key.isDown(KEYBOARD_w)
-                || key.isDown(KEYBOARD_s) || key.isDown(game.controllerButton_flip) || touch::screen_tapped()
+                || key.isDown(KEYBOARD_s) || key.isDown(game.controllerButton_flip) || touch::screen_down()
                 )
             {
                 game.press_action = true;
@@ -3539,7 +3539,7 @@ void gamecompleteinput(void)
     graphics.titlebg.bypos += graphics.titlebg.bscroll;
     game.oldcreditposition = game.creditposition;
 
-    if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip) || touch::screen_tapped())
+    if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip) || touch::screen_down())
     {
         game.creditposition -= 6;
         if (game.creditposition <= -Credits::creditmaxposition)
@@ -3587,7 +3587,7 @@ void gamecompleteinput2(void)
     //Do this here because input comes first
     game.oldcreditposx = game.creditposx;
 
-    if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip) || touch::screen_tapped())
+    if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip) || touch::screen_down())
     {
         game.creditposx++;
         game.oldcreditposx++;

diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
@@ -803,7 +803,7 @@ void scriptclass::run(void)
                     game.hascontrol = false;
                     game.pausescript = true;
                     if (key.isDown(90) || key.isDown(32) || key.isDown(86)
-                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_tapped()) game.jumpheld = true;
+                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_down()) game.jumpheld = true;
                 }
                 game.backgroundtext = false;
 
@@ -1829,7 +1829,7 @@ void scriptclass::run(void)
                     game.hascontrol = false;
                     game.pausescript = true;
                     if (key.isDown(90) || key.isDown(32) || key.isDown(86)
-                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_tapped()) game.jumpheld = true;
+                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_down()) game.jumpheld = true;
                 }
                 game.backgroundtext = false;
             }
@@ -1852,7 +1852,7 @@ void scriptclass::run(void)
                     game.hascontrol = false;
                     game.pausescript = true;
                     if (key.isDown(90) || key.isDown(32) || key.isDown(86)
-                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_tapped()) game.jumpheld = true;
+                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_down()) game.jumpheld = true;
                 }
                 game.backgroundtext = false;
             }
@@ -1873,7 +1873,7 @@ void scriptclass::run(void)
                     game.hascontrol = false;
                     game.pausescript = true;
                     if (key.isDown(90) || key.isDown(32) || key.isDown(86)
-                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_tapped()) game.jumpheld = true;
+                        || key.isDown(KEYBOARD_UP) || key.isDown(KEYBOARD_DOWN) || touch::screen_down()) game.jumpheld = true;
                 }
                 game.backgroundtext = false;
             }

diff --git a/desktop_version/src/Touch.cpp b/desktop_version/src/Touch.cpp
@@ -246,7 +246,7 @@ namespace touch
         return false;
     }
 
-    bool screen_tapped(void)
+    bool screen_down(void)
     {
         for (int i = 0; i < fingers.size(); i++)
         {
@@ -255,7 +255,7 @@ namespace touch
                 continue;
             }
 
-            return fingers[i].pressed;
+            return true;
         }
         return false;
     }

diff --git a/desktop_version/src/Touch.h b/desktop_version/src/Touch.h
@@ -57,7 +57,7 @@ namespace touch
 
     bool button_tapped(TouchButtonID button);
     bool touching_right(void);
-    bool screen_tapped(void);
+    bool screen_down(void);
 }
 
 #endif /* TOUCH_H */
diff --git a/desktop_version/src/preloader.cpp b/desktop_version/src/preloader.cpp
@@ -24,7 +24,7 @@ void preloaderinput(void)
 {
   game.press_action = false;
 
-  if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip) || touch::screen_tapped()) {
+  if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip) || touch::screen_down()) {
     game.press_action = true;
   }