1 files changed, 39 insertions, 55 deletions
diff --git a/src/utils.h b/src/utils.h
index 14e6bf70..1611b02c 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -60,79 +60,63 @@ FILE *android_fopen(const char *fileName, const char *mode);    // Replacement f
 #endif
 
 #if defined(PLATFORM_UWP)
-
 // UWP Messages System
-
-typedef enum
-{
-    None = 0,
-
-    //Send
-    ShowMouse,
-    HideMouse,
-    LockMouse,
-    UnlockMouse,
-    SetMouseLocation, //Vector0 (pos)
-
-    //Recieve (Into C)
-    RegisterKey, //Int0 (key), Char0 (status)
-    RegisterClick, //Int0 (button), Char0 (status)
-    ScrollWheelUpdate, //Int0 (delta)
-    UpdateMouseLocation, //Vector0 (pos)
-    MarkGamepadActive, //Int0 (gamepad), Bool0 (active or not)
-    MarkGamepadButton, //Int0 (gamepad), Int1 (button), Char0 (status)
-    MarkGamepadAxis,//Int0 (gamepad), int1 (axis), Float0 (value)
-    SetDisplayDims, //Vector0 (display dimensions)
-    HandleResize, //Vector0 (new dimensions) - Onresized event
-    SetGameTime, //Int0
+typedef enum {
+    UWP_MSG_NONE = 0,
+
+    // Send
+    UWP_MSG_SHOW_MOUSE,
+    UWP_MSG_HIDE_MOUSE,
+    UWP_MSG_LOCK_MOUSE,
+    UWP_MSG_UNLOCK_MOUSE,
+    UWP_MSG_SET_MOUSE_LOCATION,     // paramVector0 (pos)
+
+    // Receive (Into C)
+    UWP_MSG_REGISTER_KEY,           // paramInt0 (key), paramChar0 (status)
+    UWP_MSG_REGISTER_CLICK,         // paramInt0 (button), paramChar0 (status)
+    UWP_MSG_SCROLL_WHEEL_UPDATE,    // paramInt0 (delta)
+    UWP_MSG_UPDATE_MOUSE_LOCATION,  // paramVector0 (pos)
+    UWP_MSG_SET_GAMEPAD_ACTIVE,     // paramInt0 (gamepad), paramBool0 (active or not)
+    UWP_MSG_SET_GAMEPAD_BUTTON,     // paramInt0 (gamepad), paramInt1 (button), paramChar0 (status)
+    UWP_MSG_SET_GAMEPAD_AXIS,       // paramInt0 (gamepad), int1 (axis), paramFloat0 (value)
+    UWP_MSG_SET_DISPLAY_DIMS,       // paramVector0 (display dimensions)
+    UWP_MSG_HANDLE_RESIZE,          // paramVector0 (new dimensions) - Onresized event
+    UWP_MSG_SET_GAME_TIME,          // paramInt0
 } UWPMessageType;
 
-typedef struct UWPMessage
-{
-    //The message type
-    UWPMessageType Type;
-
-    //Vector parameters
-    Vector2 Vector0;
-
-    //Int parameters
-    int Int0;
-    int Int1;
-
-    //Char parameters
-    char Char0;
-
-    //Float parameters
-    float Float0;
-
-    //Double parameters
-	double Double0;
-
-    //Bool parameters
-    bool Bool0;
-
-    //More parameters can be added and fed to functions
+typedef struct UWPMessage {
+    UWPMessageType type;            // Message type
+    
+    Vector2 paramVector0;           // Vector parameters  
+    int paramInt0;                  // Int parameter
+    int paramInt1;                  // Int parameter
+    char paramChar0;                // Char parameters
+    float paramFloat0;              // Float parameters
+    double paramDouble0;            // Double parameters
+    bool paramBool0;                // Bool parameters
+
+    // More parameters can be added and fed to functions
 } UWPMessage;
 
-//Allocate UWP Message
+// Allocate UWP Message
 RLAPI UWPMessage* CreateUWPMessage(void);
 
-//Free UWP Message
+// Free UWP Message
 RLAPI void DeleteUWPMessage(UWPMessage* msg);
 
-//Get messages into C++
+// Get messages into C++
 RLAPI bool UWPHasMessages(void);
 RLAPI UWPMessage* UWPGetMessage(void);
 RLAPI void UWPSendMessage(UWPMessage* msg);
 
-//For C to call
-#ifndef _cplusplus //Hide from C++ code
+// For C to call
+#ifndef __cplusplus // Hide from C++ code
 void SendMessageToUWP(UWPMessage* msg);
 bool HasMessageFromUWP(void);
 UWPMessage* GetMessageFromUWP(void);
 #endif
 
-#endif
+#endif      //defined(PLATFORM_UWP)
 
 #ifdef __cplusplus
 }