tag 3.6.10, as officially released

code/ai/aicode.cpp

@@ -5485,6 +5485,8 @@ void ai_waypoints()
 			vm_vec_sub(&perp, Navs[CurrentNav].GetPosition(), &Player_obj->pos);
 			vm_vector_2_matrix(&Pl_objp->orient, &perp, NULL, NULL);
 		} else {
+			if ( !wing_leader )
+				wing_leader = Pl_objp;
 			vm_vec_scale_add(&perp, &Pl_objp->pos, &wing_leader->phys_info.vel, 1000.0f);
 			ai_turn_towards_vector(&perp, Pl_objp, flFrametime, sip->srotation_time*3.0f*scale, slop_vec, NULL, 0.0f, 0);
 		}

code/cfilearchiver/cfilearchiver.cpp

@@ -127,7 +127,13 @@ int write_index(char *hf, char *df)
 	d = fopen(df, "a+b");
 
 	if ( (h == NULL) || (d == NULL) )
+	{
+		if ( h )
+			fclose( h );
+		if ( d )
+			fclose( d );
 		return 0;
+	}
 
 	for (i = 0; i < Num_files; i++) {
 		fread(tmp_data, 32+4+4+4, 1, h);

code/globalincs/def_files.cpp

@@ -320,7 +320,7 @@ $Fog:																	\n\
 $AI:																	\n\
 	+Valid goals:			( \"fly to ship\" \"dock\" \"undock\" \"waypoints\" \"waypoints once\" \"stay near ship\" \"keep safe dist\" \"stay still\" \"play dead\" )							\n\
 	+Accept Player Orders:	YES											\n\
-	+Player orders:			( \"rearm me\" \"abort rearm\" \"stay near me\" \"stay near ship\" \"keep safe dist\" \"depart\" )																	\n\
+	+Player orders:			( \"rearm me\" \"abort rearm\" \"depart\" )																	\n\
 	+Auto attacks:			YES											\n\
 	+Actively Pursues:		( \"navbuoy\" \"sentry gun\" \"escape pod\" \"cargo\" \"support\" \"stealth\" \"fighter\" \"bomber\" \"fighter/bomber\" \"transport\" \"freighter\" \"awacs\" \"gas miner\" \"cruiser\" \"corvette\" \"capital\" \"super cap\" \"drydock\" \"knossos device\" )	\n\
 	+Guards attack this:	YES											\n\

code/hud/hudwingmanstatus.cpp

@@ -279,23 +279,6 @@ int HUD_wingman_right_coords[GR_NUM_RESOLUTIONS][5][2] = {
 	}
 };
 
-// special coordinates if only one wing is present
-int HUD_wingman_status_single_coords[GR_NUM_RESOLUTIONS][4][2] = 
-{
-	{ // GR_640
-		{589,159},				// where to draw dots 1 - 4 if we have only one wing present (special case)
-		{582,167},
-		{596,167},
-		{589,175},
-	}, 
-	{ // GR_1024
-		{971,159},
-		{964,167},
-		{978,167},
-		{971,175},
-	}
-};
-
 int HUD_wingman_status_name_coords[GR_NUM_RESOLUTIONS][MAX_SQUADRON_WINGS][2] =
 {
 	{ // GR_640
@@ -314,6 +297,27 @@ int HUD_wingman_status_name_coords[GR_NUM_RESOLUTIONS][MAX_SQUADRON_WINGS][2] =
 	}
 };
 
+// special coordinates if only one wing is present
+int HUD_wingman_status_single_coords[GR_NUM_RESOLUTIONS][MAX_SHIPS_PER_WING][2] = 
+{
+	{ // GR_640
+		{589,159},				// where to draw dots if we have only one wing present (special case)
+		{582,167},
+		{596,167},
+		{589,175},
+		{578,175},
+		{600,175},
+	}, 
+	{ // GR_1024
+		{971,159},
+		{964,167},
+		{978,167},
+		{971,175},
+		{960,175},
+		{982,175},
+	}
+};
+
 int HUD_wingman_status_coords[GR_NUM_RESOLUTIONS][MAX_SQUADRON_WINGS][MAX_SHIPS_PER_WING][2] = 
 {
 	// we will only ever display up to 5 wings

code/mission/missionbriefcommon.cpp

@@ -1916,6 +1916,12 @@ ubyte brief_return_color_index(char c)
 		case 'b':
 			return BRIEF_TEXT_BLUE;
 
+ 		case 'w':
+ 			return BRIEF_TEXT_WHITE;
+ 
+ 		case 'y':
+ 			return BRIEF_TEXT_YELLOW;
+ 
 		default:	
 			Int3();	// unsupported meta-code
 			break;

code/mission/missionparse.cpp

@@ -5967,7 +5967,7 @@ int parse_mission(mission *pm, int flags)
 	if ((saved_warning_count - Global_warning_count) > 10 || (saved_error_count - Global_error_count) > 0) {
 		char text[512];
 		sprintf(text, "Warning!\n\nThe current mission has generated %d warnings and/or errors during load.  These are usually caused by corrupted ship models or syntax errors in the mission file.  While FreeSpace Open will attempt to compensate for these issues, it cannot guarantee a trouble-free gameplay experience.  Source Code Project staff cannot provide assistance or support for these problems, as they are caused by the mission's data files, not FreeSpace Open's source code.", (saved_warning_count - Global_warning_count) + (saved_error_count - Global_error_count));
-		popup(PF_TITLE_BIG | PF_TITLE_RED, 1, POPUP_OK, text);
+		popup(PF_TITLE_BIG | PF_TITLE_RED | PF_NO_NETWORKING, 1, POPUP_OK, text);
 	}
 
 	// success

code/ship/ship.cpp

@@ -3579,6 +3579,14 @@ int parse_ship_values(ship_info* sip, bool isTemplate, bool first_time, bool rep
 	{
 		if(optional_string("+Max Glide Speed:"))
 			stuff_float(&sip->glide_cap );
+		
+		// 3.6.9 had one set of behaviour for glide acceleration. This was later changed in 3.6.10 and will be changed back again in 
+		// 3.6.11 and will require the following table entry for the 3.6.10 behaviour. In order to preserve compatibility with the 
+		// upcoming change, 3.6.10 builds should be able to parse the entry, even if they don't do anything with it.
+		if(optional_string("+Glide Accel Mult:")) {
+			float dummy; 
+			stuff_float(&dummy);
+		}
 	}
 
 	if(optional_string("$Autoaim FOV:"))