Index: code/playerman/playercontrol.cpp
===================================================================
--- code/playerman/playercontrol.cpp	(revision 5165)
+++ code/playerman/playercontrol.cpp	(working copy)
@@ -1218,13 +1218,16 @@
 					tspeed = tspeed * (0.5f + dist/200.0f);
 				}
 
-				//pmax_speed = Ship_info[Ships[Player_obj->instance].ship_info_index].max_speed;
-				pmax_speed = Ships[Player_obj->instance].current_max_speed;
-				ci->forward_cruise_percent = (tspeed / pmax_speed) * 100.0f;
-				override_analog_throttle = 1;
-	//			if ( ci->forward_cruise_percent > 100.0f )
-	//				HUD_printf ("Cannot travel that fast.  Setting throttle to full.");
-				// mprintf(("forward -- %7.3f\n", ci->forward_cruise_percent));
+				//SUSHI: If gliding, don't do anything for speed matching
+				if (!(Objects[Player->objnum].phys_info.flags & PF_GLIDING)) {
+					//pmax_speed = Ship_info[Ships[Player_obj->instance].ship_info_index].max_speed;
+					pmax_speed = Ships[Player_obj->instance].current_max_speed;
+					ci->forward_cruise_percent = (tspeed / pmax_speed) * 100.0f;
+					override_analog_throttle = 1;
+					//if ( ci->forward_cruise_percent > 100.0f )
+						//HUD_printf ("Cannot travel that fast.  Setting throttle to full.");
+					// mprintf(("forward -- %7.3f\n", ci->forward_cruise_percent));
+				}
 
 			} else
 				Player->flags &= ~PLAYER_FLAGS_MATCH_TARGET;