From 155e375f949f2afd65c2025a6dfa6b096b7e301c Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 13 Dec 2020 18:34:48 +1100 Subject: [PATCH] Stop exposing Pointer_SetPressed, as it is only supposed to be called from within Input.c so state remains consistent --- src/Input.c | 2 ++ src/Input.h | 4 +--- src/Menus.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Input.c b/src/Input.c index 407d7ac85..8aa7bfae3 100644 --- a/src/Input.c +++ b/src/Input.c @@ -33,6 +33,8 @@ static float input_fovIndex = -1.0f; static cc_bool suppressEscape; #endif enum MouseButton_ { MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE }; +/* Raises PointerEvents.Up or PointerEvents.Down */ +static void Pointer_SetPressed(int idx, cc_bool pressed); /*########################################################################################################################* diff --git a/src/Input.h b/src/Input.h index a4ad3f164..a63933bca 100644 --- a/src/Input.h +++ b/src/Input.h @@ -94,11 +94,9 @@ void Input_RemoveTouch(long id, int x, int y); /* Data for mouse and touch */ extern struct Pointer { int x, y; } Pointers[INPUT_MAX_POINTERS]; -/* X and Y coordinates of the mouse. Use Mouse_SetPosition to change. */ +/* (OBSOLETE) X and Y coordinates of the mouse. Use Mouse_SetPosition to change. */ extern int Mouse_X, Mouse_Y; -/* Raises PointerEvents.Up or PointerEvents.Down. */ -void Pointer_SetPressed(int idx, cc_bool pressed); /* Raises InputEvents.Wheel with the given wheel delta. */ void Mouse_ScrollWheel(float delta); /* Sets X and Y position of the given pointer, always raising PointerEvents.Moved. */ diff --git a/src/Menus.c b/src/Menus.c index d53c32d63..62160dc10 100644 --- a/src/Menus.c +++ b/src/Menus.c @@ -3767,11 +3767,11 @@ static void TouchOnscreenScreen_Init(void* screen) { s->numWidgets = Array_Elems(touchOnscreen_widgets); s->maxVertices = TOUCHONSCREEN_MAX_VERTICES; - TouchOnscreen_UpdateColors(screen); Menu_InitBack(&s->back, TouchOnscreen_More); ButtonWidget_Init(&s->left, 40, TouchOnscreen_Left); ButtonWidget_Init(&s->right, 40, TouchOnscreen_Right); TouchOnscreen_SetPage(s, true); + TouchOnscreen_UpdateColors(screen); } static const struct ScreenVTABLE TouchOnscreenScreen_VTABLE = {