Misc cleanup

Author: MaximDude

Managers/UInputMan.cpp

@@ -13,8 +13,7 @@
 
 #ifdef _WIN32
 #include "joystickapi.h"
-#endif
-#ifdef __unix__
+#elif __unix__
 #include <fcntl.h>
 #include "allegro/internal/aintern.h"
 #include "allegro/platform/aintunix.h"
@@ -101,12 +100,10 @@ namespace RTE {
 			}
 		}
 
-
 #ifdef __unix__
 		m_AllegroMousePreviousX = 0;
 		m_AllegroMousePreviousY = 0;
 #endif
-
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1056,13 +1053,11 @@ namespace RTE {
 					}
 					break;
 				}
-
 				default:
 					XPutBackEvent(_xwin.display, &(*event));
 					break;
 			}
 		}
-
 		XFlush(_xwin.display);
 
 		_xwin.mouse_warped = 0;
@@ -1072,17 +1067,14 @@ namespace RTE {
 			mouse_x = _xwin.window_width / 2;
 			mouse_y = _xwin.window_height / 2;
 		}
-
 		_mouse_x = mouse_x;
 		_mouse_y = mouse_y;
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void UInputMan::WarpMouse(int x, int y) const {
-		if (mouse_x != x || mouse_y != y) {
-			XWarpPointer(_xwin.display, _xwin.window, _xwin.window, 0, 0, 0, 0, x, y);
-		}
+		if (mouse_x != x || mouse_y != y) { XWarpPointer(_xwin.display, _xwin.window, _xwin.window, 0, 0, 0, 0, x, y); }
 		_mouse_x = mouse_x = x;
 		_mouse_y = mouse_y = y;
 	}

Managers/UInputMan.h

@@ -806,15 +806,15 @@ namespace RTE {
 		static void XWinInputHandlerOverride() { g_UInputMan.HandleAllegroMouseInput(); }
 
 		/// <summary>
-		/// Mouse input handler to circumvent the input drops that allegro does regularly, by replacing and disabling the default warping behaviour.
-		/// Motion events that are generated while the handler is working are offset such that the allegro driver doesn't mess up the mickeys.
-		/// This also handles the centering warp for relative mouse motion. Might not run in the main thread, depending on how allegro was built.
+		/// Mouse input handler to circumvent the input drops that Allegro does regularly, by replacing and disabling the default warping behavior.
+		/// Motion events that are generated while the handler is working are offset such that the Allegro driver doesn't mess up the mickeys.
+		/// This also handles the centering warp for relative mouse motion. Might not run in the main thread, depending on how Allegro was built.
 		/// </summary>
 		void HandleAllegroMouseInput();
 
 		/// <summary>
 		/// Position the mouse on the screen in window coordinates. Generates MouseMotion events if the requested position is different from the actual mouse position.
-		/// Replaces position_mouse and sets the allegro internal mouse position to the requested x,y.
+		/// Replaces position_mouse and sets the Allegro internal mouse position to the requested coordinates.
 		/// </summary>
 		/// <param name="x"> The x coordinate to warp to. </param>
 		/// <param name="y"> The y coordinate to warp to. </param>