mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 10:09:43 +01:00
Code Issues Releases Wiki Activity

Replace screen_tapped with screen_down

Browse source
This commit is contained in:
NyakoFox 2024-04-11 19:55:03 -03:00
parent 1412c90a92
commit c5b3664d5e
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop_version/src/Input.cpp
View file

@ -2392,7 +2392,7 @@ void titleinput(void)
} }
} }
if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) || key.isDown(game.controllerButton_flip) 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; game.press_action = true;
} }
@ -2648,7 +2648,7 @@ void gameinput(void)
game.press_action = false; game.press_action = false;
if (key.isDown(KEYBOARD_z) || key.isDown(KEYBOARD_SPACE) || key.isDown(KEYBOARD_v) 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_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; game.press_action = true;
@ -3545,7 +3545,7 @@ void gamecompleteinput(void)
graphics.titlebg.bypos += graphics.titlebg.bscroll; graphics.titlebg.bypos += graphics.titlebg.bscroll;
game.oldcreditposition = game.creditposition; 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; game.creditposition -= 6;
if (game.creditposition <= -Credits::creditmaxposition) if (game.creditposition <= -Credits::creditmaxposition)
@ -3593,7 +3593,7 @@ void gamecompleteinput2(void)
//Do this here because input comes first //Do this here because input comes first
game.oldcreditposx = game.creditposx; 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.creditposx++;
game.oldcreditposx++; game.oldcreditposx++;

8
desktop_version/src/Script.cpp
View file

@ -803,7 +803,7 @@ void scriptclass::run(void)
game.hascontrol = false; game.hascontrol = false;
game.pausescript = true; game.pausescript = true;
if (key.isDown(90) || key.isDown(32) || key.isDown(86) 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; game.backgroundtext = false;
@ -1853,7 +1853,7 @@ void scriptclass::run(void)
game.hascontrol = false; game.hascontrol = false;
game.pausescript = true; game.pausescript = true;
if (key.isDown(90) || key.isDown(32) || key.isDown(86) 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; game.backgroundtext = false;
} }
@ -1876,7 +1876,7 @@ void scriptclass::run(void)
game.hascontrol = false; game.hascontrol = false;
game.pausescript = true; game.pausescript = true;
if (key.isDown(90) || key.isDown(32) || key.isDown(86) 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; game.backgroundtext = false;
} }
@ -1897,7 +1897,7 @@ void scriptclass::run(void)
game.hascontrol = false; game.hascontrol = false;
game.pausescript = true; game.pausescript = true;
if (key.isDown(90) || key.isDown(32) || key.isDown(86) 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; game.backgroundtext = false;
} }

4
desktop_version/src/Touch.cpp
View file

@ -246,7 +246,7 @@ namespace touch
return false; return false;
} }
bool screen_tapped(void) bool screen_down(void)
{ {
for (int i = 0; i < fingers.size(); i++) for (int i = 0; i < fingers.size(); i++)
{ {
@ -255,7 +255,7 @@ namespace touch
continue; continue;
} }
return fingers[i].pressed; return true;
} }
return false; return false;
} }

2
desktop_version/src/Touch.h
View file

@ -57,7 +57,7 @@ namespace touch
bool button_tapped(TouchButtonID button); bool button_tapped(TouchButtonID button);
bool touching_right(void); bool touching_right(void);
bool screen_tapped(void); bool screen_down(void);
} }
#endif /* TOUCH_H */ #endif /* TOUCH_H */

2
desktop_version/src/preloader.cpp
View file

@ -24,7 +24,7 @@ void preloaderinput(void)
{ {
game.press_action = false; 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; game.press_action = true;
} }