Merge branch 'port' into port-net

src/game/menu.c

@@ -4744,8 +4744,9 @@ void menuProcessInput(void)
 				inputs.select = 1;
 			}
 
-			// don't back out on weapon back when using mouse because it's likely bound to wheel
-			if (!g_MenuMouseControl && (buttonsnow & BUTTON_WPNBACK)) {
+			// HACK: don't back out on weapon back when it's bound to wheel
+			const bool wheel = inputKeyPressed(VK_MOUSE_WHEEL_UP) || inputKeyPressed(VK_MOUSE_WHEEL_DN);
+			if ((buttonsnow & BUTTON_WPNBACK) && !wheel) {
 				inputs.back = 1;
 			}
 #endif
@@ -4779,6 +4780,7 @@ void menuProcessInput(void)
 			if ((sticky < 0 ? -sticky : sticky) < (thissticky < 0 ? -thissticky : thissticky)) {
 				sticky = thissticky;
 			}
+
 #ifndef PLATFORM_N64
 			if ((sticky < 0 ? -sticky : sticky) < (thisrsticky < 0 ? -thisrsticky : thisrsticky)) {
 				sticky = thisrsticky;

src/lib/audiomgr.c

@@ -424,8 +424,7 @@ void *amgrThread(void *arg)
 	f64 nexttick = sysGetMicroseconds();
 	f64 tick;
 
-	while (running)
-	{
+	while (running) {
 		tick = sysGetMicroseconds() + 0.01;
 
 		while (nexttick < tick) {