mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-09-13 09:35:23 -04:00
Mobile: Fix if you're holding jump then open menu with a different finger, then release both in that menu, jump sometimes gets stuck down
This commit is contained in:
UnknownShadow200
parent
91bcfd2d37
commit
a55580b107
32
src/Menus.c
32
src/Menus.c
@ -398,7 +398,7 @@ static const struct ScreenVTABLE ListScreen_VTABLE = {
|
||||
ListScreen_Init, Screen_NullUpdate, ListScreen_Free,
|
||||
ListScreen_Render, Screen_BuildMesh,
|
||||
ListScreen_KeyDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, ListScreen_MouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, ListScreen_MouseScroll,
|
||||
ListScreen_Layout, ListScreen_ContextLost, ListScreen_ContextRecreated
|
||||
};
|
||||
void ListScreen_Show(void) {
|
||||
@ -532,7 +532,7 @@ static const struct ScreenVTABLE PauseScreen_VTABLE = {
|
||||
PauseScreen_Init, Screen_NullUpdate, PauseScreen_Free,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
PauseScreen_Layout, Screen_ContextLost, PauseScreen_ContextRecreated
|
||||
};
|
||||
void PauseScreen_Show(void) {
|
||||
@ -659,7 +659,7 @@ static const struct ScreenVTABLE OptionsGroupScreen_VTABLE = {
|
||||
OptionsGroupScreen_Init, Screen_NullUpdate, OptionsGroupScreen_Free,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, OptionsGroupScreen_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, OptionsGroupScreen_PointerMove, Screen_TMouseScroll,
|
||||
OptionsGroupScreen_Layout, OptionsGroupScreen_ContextLost, OptionsGroupScreen_ContextRecreated
|
||||
};
|
||||
void OptionsGroupScreen_Show(void) {
|
||||
@ -920,7 +920,7 @@ static const struct ScreenVTABLE EditHotkeyScreen_VTABLE = {
|
||||
EditHotkeyScreen_Init, EditHotkeyScreen_Update, Menu_CloseKeyboard,
|
||||
EditHotkeyScreen_Render, Screen_BuildMesh,
|
||||
EditHotkeyScreen_KeyDown, Screen_TInput, EditHotkeyScreen_KeyPress, EditHotkeyScreen_TextChanged,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
EditHotkeyScreen_Layout, EditHotkeyScreen_ContextLost, EditHotkeyScreen_ContextRecreated
|
||||
};
|
||||
void EditHotkeyScreen_Show(struct HotkeyData original) {
|
||||
@ -1124,7 +1124,7 @@ static const struct ScreenVTABLE GenLevelScreen_VTABLE = {
|
||||
GenLevelScreen_Init, GenLevelScreen_Update, Menu_CloseKeyboard,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
GenLevelScreen_KeyDown, Screen_TInput, GenLevelScreen_KeyPress, GenLevelScreen_TextChanged,
|
||||
GenLevelScreen_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
GenLevelScreen_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
GenLevelScreen_Layout, GenLevelScreen_ContextLost, GenLevelScreen_ContextRecreated
|
||||
};
|
||||
void GenLevelScreen_Show(void) {
|
||||
@ -1200,7 +1200,7 @@ static const struct ScreenVTABLE ClassicGenScreen_VTABLE = {
|
||||
ClassicGenScreen_Init, Screen_NullUpdate, Screen_NullFunc,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
ClassicGenScreen_Layout, Screen_ContextLost, ClassicGenScreen_ContextRecreated
|
||||
};
|
||||
void ClassicGenScreen_Show(void) {
|
||||
@ -1480,7 +1480,7 @@ static const struct ScreenVTABLE SaveLevelScreen_VTABLE = {
|
||||
SaveLevelScreen_Init, SaveLevelScreen_Update, Menu_CloseKeyboard,
|
||||
SaveLevelScreen_Render, Screen_BuildMesh,
|
||||
SaveLevelScreen_KeyDown, Screen_TInput, SaveLevelScreen_KeyPress, SaveLevelScreen_TextChanged,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
SaveLevelScreen_Layout, SaveLevelScreen_ContextLost, SaveLevelScreen_ContextRecreated
|
||||
};
|
||||
void SaveLevelScreen_Show(void) {
|
||||
@ -1845,7 +1845,7 @@ static const struct ScreenVTABLE KeyBindsScreen_VTABLE = {
|
||||
KeyBindsScreen_Init, Screen_NullUpdate, Screen_NullFunc,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
KeyBindsScreen_KeyDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
KeyBindsScreen_Layout, KeyBindsScreen_ContextLost, KeyBindsScreen_ContextRecreated
|
||||
};
|
||||
|
||||
@ -2103,7 +2103,7 @@ static const struct ScreenVTABLE MenuInputOverlay_VTABLE = {
|
||||
MenuInputOverlay_Init, MenuInputOverlay_Update, MenuInputOverlay_Free,
|
||||
MenuInputOverlay_Render, Screen_BuildMesh,
|
||||
MenuInputOverlay_KeyDown, Screen_TInput, MenuInputOverlay_KeyPress, MenuInputOverlay_TextChanged,
|
||||
MenuInputOverlay_PointerDown, Screen_TPointer, MenuInputOverlay_PointerMove, Screen_TMouseScroll,
|
||||
MenuInputOverlay_PointerDown, Screen_FPointer, MenuInputOverlay_PointerMove, Screen_TMouseScroll,
|
||||
MenuInputOverlay_Layout, MenuInputOverlay_ContextLost, MenuInputOverlay_ContextRecreated
|
||||
};
|
||||
void MenuInputOverlay_Show(struct MenuInputDesc* desc, const cc_string* value, MenuInputDone onDone, cc_bool screenMode) {
|
||||
@ -2393,7 +2393,7 @@ static const struct ScreenVTABLE MenuOptionsScreen_VTABLE = {
|
||||
MenuOptionsScreen_Init, Screen_NullUpdate, MenuOptionsScreen_Free,
|
||||
MenuOptionsScreen_Render, MenuOptionsScreen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, MenuOptionsScreen_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, MenuOptionsScreen_PointerMove, Screen_TMouseScroll,
|
||||
MenuOptionsScreen_Layout, MenuOptionsScreen_ContextLost, MenuOptionsScreen_ContextRecreated
|
||||
};
|
||||
void MenuOptionsScreen_Show(struct MenuInputDesc* descs, const char** descriptions, int descsCount, InitMenuOptions init) {
|
||||
@ -3311,7 +3311,7 @@ static const struct ScreenVTABLE TexIdsOverlay_VTABLE = {
|
||||
TexIdsOverlay_Init, Screen_NullUpdate, TexIdsOverlay_Free,
|
||||
TexIdsOverlay_Render, TexIdsOverlay_BuildMesh,
|
||||
TexIdsOverlay_KeyDown, Screen_FInput, Screen_FKeyPress, Screen_FText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
TexIdsOverlay_Layout, TexIdsOverlay_ContextLost, TexIdsOverlay_ContextRecreated
|
||||
};
|
||||
void TexIdsOverlay_Show(void) {
|
||||
@ -3393,7 +3393,7 @@ static const struct ScreenVTABLE UrlWarningOverlay_VTABLE = {
|
||||
UrlWarningOverlay_Init, Screen_NullUpdate, Screen_NullFunc,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
UrlWarningOverlay_Layout, Screen_ContextLost, UrlWarningOverlay_ContextRecreated
|
||||
};
|
||||
void UrlWarningOverlay_Show(const cc_string* url) {
|
||||
@ -3567,7 +3567,7 @@ static const struct ScreenVTABLE TexPackOverlay_VTABLE = {
|
||||
TexPackOverlay_Init, TexPackOverlay_Update, Screen_NullFunc,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
TexPackOverlay_Layout, TexPackOverlay_ContextLost, TexPackOverlay_ContextRecreated
|
||||
};
|
||||
void TexPackOverlay_Show(const cc_string* url) {
|
||||
@ -3675,7 +3675,7 @@ static const struct ScreenVTABLE TouchOnscreenScreen_VTABLE = {
|
||||
TouchOnscreenScreen_Init, Screen_NullUpdate, Screen_NullFunc,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
TouchOnscreenScreen_Layout, TouchOnscreenScreen_ContextLost, TouchOnscreenScreen_ContextRecreated
|
||||
};
|
||||
void TouchOnscreenScreen_Show(void) {
|
||||
@ -3814,7 +3814,7 @@ static const struct ScreenVTABLE TouchCtrlsScreen_VTABLE = {
|
||||
TouchCtrlsScreen_Init, Screen_NullUpdate, Screen_NullFunc,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
TouchCtrlsScreen_Layout, TouchCtrlsScreen_ContextLost, TouchCtrlsScreen_ContextRecreated
|
||||
};
|
||||
void TouchCtrlsScreen_Show(void) {
|
||||
@ -3899,7 +3899,7 @@ static const struct ScreenVTABLE TouchMoreScreen_VTABLE = {
|
||||
TouchMoreScreen_Init, Screen_NullUpdate, Screen_NullFunc,
|
||||
MenuScreen_Render2, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
TouchMoreScreen_Layout, Screen_ContextLost, TouchMoreScreen_ContextRecreated
|
||||
};
|
||||
void TouchMoreScreen_Show(void) {
|
||||
|
||||
@ -1670,7 +1670,7 @@ cc_bool Platform_DescribeError(cc_result res, cc_string* dst) {
|
||||
char chars[NATIVE_STR_LEN];
|
||||
int len;
|
||||
|
||||
/* For unrecognised error codes, strerror_r might return messages
|
||||
/* For unrecognised error codes, strerror_r might return messages */
|
||||
/* such as 'No error information', which is not very useful */
|
||||
/* (could check errno here but quicker just to skip entirely) */
|
||||
if (res >= 1000) return false;
|
||||
|
||||
@ -1649,7 +1649,7 @@ static const struct ScreenVTABLE LoadingScreen_VTABLE = {
|
||||
LoadingScreen_Init, Screen_NullUpdate, LoadingScreen_Free,
|
||||
LoadingScreen_Render, LoadingScreen_BuildMesh,
|
||||
Screen_TInput, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Screen_TPointer, Screen_TPointer, Screen_TPointer, Screen_TMouseScroll,
|
||||
Screen_TPointer, Screen_FPointer, Screen_TPointer, Screen_TMouseScroll,
|
||||
LoadingScreen_Layout, LoadingScreen_ContextLost, LoadingScreen_ContextRecreated
|
||||
};
|
||||
void LoadingScreen_Show(const cc_string* title, const cc_string* message) {
|
||||
@ -1724,7 +1724,7 @@ static const struct ScreenVTABLE GeneratingScreen_VTABLE = {
|
||||
GeneratingScreen_Init, GeneratingScreen_Update, GeneratingScreen_Free,
|
||||
GeneratingScreen_Render, LoadingScreen_BuildMesh,
|
||||
Screen_TInput, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Screen_TPointer, Screen_TPointer, Screen_FPointer, Screen_TMouseScroll,
|
||||
Screen_TPointer, Screen_FPointer, Screen_FPointer, Screen_TMouseScroll,
|
||||
LoadingScreen_Layout, LoadingScreen_ContextLost, LoadingScreen_ContextRecreated
|
||||
};
|
||||
void GeneratingScreen_Show(void) {
|
||||
@ -1868,7 +1868,7 @@ static const struct ScreenVTABLE DisconnectScreen_VTABLE = {
|
||||
DisconnectScreen_Init, DisconnectScreen_Update, DisconnectScreen_Free,
|
||||
DisconnectScreen_Render, Screen_BuildMesh,
|
||||
Screen_InputDown, Screen_TInput, Screen_TKeyPress, Screen_TText,
|
||||
Menu_PointerDown, Screen_TPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
Menu_PointerDown, Screen_FPointer, Menu_PointerMove, Screen_TMouseScroll,
|
||||
DisconnectScreen_Layout, DisconnectScreen_ContextLost, DisconnectScreen_ContextRecreated
|
||||
};
|
||||
void DisconnectScreen_Show(const cc_string* title, const cc_string* message) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user