Merge pull request #2214 from notimaginative/multi_packet_fixes

Multi packet fixes

Author: JohnAFernandez

code/globalincs/globals.h

@@ -39,11 +39,6 @@
 
 // from missionparse.h and then redefined to the same value in sexp.h
 #define TOKEN_LENGTH	32
-// ****************************************************************
-// DO NOT CHANGE THIS - IT WILL LIKELY BREAK FREESPACE2 PXO SUPPORT
-// TALK TO DAVE B FIRST
-// ****************************************************************
-#define MAX_SHIP_CLASSES_MULTI	130
 
 #define MAX_SHIP_CLASSES		500
 

code/menuui/barracks.cpp

@@ -1154,11 +1154,6 @@ void barracks_button_pressed(int n)
 			break;
 
 		case B_PILOT_MULTI_MODE_BUTTON:
-			if ( Networking_disabled ) {
-				game_feature_disabled_popup();
-				break;
-			}
-
 			if (Player_sel_mode != PLAYER_SELECT_MODE_MULTI) {
 				gamesnd_play_iface(InterfaceSounds::USER_SELECT);
 				Cur_pilot->flags |= PLAYER_FLAGS_IS_MULTI;
@@ -1539,11 +1534,6 @@ void barracks_do_frame(float  /*frametime*/)
 				break;
 
 			case KEY_TAB:  // switch mode (simgle/multi)
-				if ( Networking_disabled ) {
-					game_feature_disabled_popup();
-					break;
-				}
-
 				if (Player_sel_mode == PLAYER_SELECT_MODE_SINGLE) {
 					Cur_pilot->flags |= PLAYER_FLAGS_IS_MULTI;
 					Cur_pilot->player_was_multi = 1;

code/menuui/optionsmenu.cpp

@@ -586,11 +586,6 @@ void options_change_tab(int n)
 
 	switch (n) {
 		case MULTIPLAYER_TAB:
-			if ( Networking_disabled ) {
-				game_feature_disabled_popup();
-				return;
-			}
-
 			if ( !Options_multi_inited ) {
 				// init multiplayer
 				options_multi_init(&Ui_window);

code/menuui/playermenu.cpp

@@ -327,7 +327,7 @@ void player_select_init()
 
 // if we found a pilot
 	if ( player_select_get_last_pilot_info() ) {
-		if (Player_select_last_is_multi && !Networking_disabled) {
+		if (Player_select_last_is_multi) {
 			player_select_init_player_stuff(PLAYER_SELECT_MODE_MULTI);
 		} else {
 			player_select_init_player_stuff(PLAYER_SELECT_MODE_SINGLE);
@@ -689,10 +689,6 @@ void player_select_button_pressed(int n)
 
 	case MULTI_BUTTON:
 		Player_select_autoaccept = 0;
-		if ( Networking_disabled ) {
-			game_feature_disabled_popup();
-			break;
-		}
 
 		// switch to multiplayer mode
 		if (Player_select_mode != PLAYER_SELECT_MODE_MULTI) {

code/mission/missioncampaign.cpp

@@ -97,7 +97,7 @@ campaign Campaign;
  * In the type field, we return if the campaign is a single player or multiplayer campaign.  
  * The type field will only be valid if the name returned is non-NULL
  */
-int mission_campaign_get_info(const char *filename, char *name, int *type, int *max_players, char **desc)
+int mission_campaign_get_info(const char *filename, char *name, int *type, int *max_players, char **desc, char **first_mission)
 {
 	int i, success = 0;
 	char campaign_type[NAME_LENGTH], fname[MAX_FILENAME_LEN];
@@ -154,6 +154,11 @@ int mission_campaign_get_info(const char *filename, char *name, int *type, int *
 			if ((*type) != CAMPAIGN_TYPE_SINGLE) {
 				skip_to_string("+Num Players:");
 				stuff_int(max_players);
+				// Cyborg17 - and the first mission name if we want it, too
+				if (first_mission) {
+					skip_to_string("$Mission:");
+					*first_mission = stuff_and_malloc_string(F_NAME, nullptr);
+				}
 			}
 
 			// if we found a valid campaign type

code/mission/missioncampaign.h

@@ -206,7 +206,7 @@ void mission_campaign_savefile_generate_root(char *filename, player *pl = NULL);
 // execute the corresponding mission_campaign_savefile functions.
 
 // get name and type of specified campaign file
-int mission_campaign_get_info(const char *filename, char *name, int *type, int *max_players, char **desc = NULL);
+int mission_campaign_get_info(const char *filename, char *name, int *type, int *max_players, char **desc = nullptr, char **first_mission = nullptr);
 
 // get a listing of missions in a campaign
 int mission_campaign_get_mission_list(const char *filename, char **list, int max);

code/mission/missionparse.cpp

@@ -2447,7 +2447,7 @@ int parse_create_object_sub(p_object *p_objp)
 		if (!object_is_docked(p_objp) || (p_objp->flags[Mission::Parse_Object_Flags::SF_Dock_leader]))
 		{
 			if ((Game_mode & GM_IN_MISSION) && MULTIPLAYER_MASTER && (p_objp->wingnum == -1))
-				send_ship_create_packet(&Objects[objnum], (p_objp == Arriving_support_ship) ? 1 : 0);
+				send_ship_create_packet(&Objects[objnum], (p_objp == Arriving_support_ship));
 		}
 		// also add this ship to the multi ship tracking and interpolation struct
 		multi_ship_record_add_ship(objnum);

code/missionui/missionscreencommon.cpp

@@ -1340,11 +1340,12 @@ int wss_get_mode(int from_slot, int from_list, int to_slot, int to_list, int wl_
 }
 
 // store all the unit data and pool data 
-int store_wss_data(ubyte *block, int max_size, interface_snd_id sound,int player_index)
+int store_wss_data(ubyte *data, __UNUSED const unsigned int max_size, interface_snd_id sound, int player_index)
 {
-	int j, i,offset=0;	
-	short player_id;	
-	short ishort;
+	int j, i, packet_size = 0;
+	ubyte val;
+	short player_id;
+	ushort pool_size;
 
 	// this function assumes that the data is going to be used over the network
 	// so make a non-network version of this function if needed
@@ -1354,72 +1355,64 @@ int store_wss_data(ubyte *block, int max_size, interface_snd_id sound,int player
 	if ( !(Game_mode & GM_MULTIPLAYER) )
 		return 0;
 
-
-	// write the ship pool 
-	for ( i = 0; i < ship_info_size(); i++ ) {
-		if ( Ss_pool[i] > 0 ) {	
-			block[offset++] = (ubyte)i;
-			Assert( Ss_pool[i] < UCHAR_MAX );
-			
-			// take care of sign issues
-			if(Ss_pool[i] == -1){
-				block[offset++] = 0xff;
-			} else {
-				block[offset++] = (ubyte)Ss_pool[i];
-			}
+	// write the ship pool
+	pool_size = 0;
+	for (i = 0; i < ship_info_size(); i++) {
+		if (Ss_pool[i] > 0) {
+			++pool_size;
 		}
 	}
 
-	block[offset++] = 0xff;	// signals start of weapons pool
+	ADD_USHORT(pool_size);
+
+	Assertion((((sizeof(short)+sizeof(short)) * pool_size) + packet_size) < max_size, "Size of ship pool exceeds max data size!");
+
+	for (i = 0; i < ship_info_size(); i++) {
+		if (Ss_pool[i] > 0) {
+			ADD_SHORT(static_cast<short>(i));
+			ADD_SHORT(static_cast<short>(Ss_pool[i]));
+		}
+	}
 
 	// write the weapon pool
-	for ( i = 0; i < weapon_info_size(); i++ ) {
-		if ( Wl_pool[i] > 0 ) {
-			block[offset++] = (ubyte)i;
-			ishort = INTEL_SHORT( (short)Wl_pool[i] );
-			memcpy(block+offset, &ishort, sizeof(short));
-			offset += sizeof(short);
+	pool_size = 0;
+	for (i = 0; i < weapon_info_size(); i++) {
+		if (Wl_pool[i] > 0) {
+			++pool_size;
 		}
 	}
 
-	// write the unit data
+	ADD_USHORT(pool_size);
 
-	block[offset++] = 0xff; // signals start of unit data
+	Assertion((((sizeof(short)+sizeof(short)) * pool_size) + packet_size) < max_size, "Size of weapon pool exceeds max data size!");
 
-	for ( i=0; i<MAX_WSS_SLOTS; i++ ) {
-		Assert( Wss_slots[i].ship_class < UCHAR_MAX );
-		if(Wss_slots[i].ship_class == -1){
-			block[offset++] = 0xff;
-		} else {
-			block[offset++] = (ubyte)(Wss_slots[i].ship_class);
+	for (i = 0; i < weapon_info_size(); i++) {
+		if (Wl_pool[i] > 0) {
+			ADD_SHORT(static_cast<short>(i));
+			ADD_SHORT(static_cast<short>(Wl_pool[i]));
 		}
-		for ( j = 0; j < MAX_SHIP_WEAPONS; j++ ) {
-			// take care of sign issues
-			Assert( Wss_slots[i].wep[j] < UCHAR_MAX );			
-			if(Wss_slots[i].wep[j] == -1){
-				block[offset++] = 0xff;
-			} else {
-				block[offset++] = (ubyte)(Wss_slots[i].wep[j]);
-			}
+	}
 
-			Assert( Wss_slots[i].wep_count[j] < SHRT_MAX );
-			ishort = INTEL_SHORT( (short)Wss_slots[i].wep_count[j] );
+	// write the unit data
+	val = MAX_WSS_SLOTS;
+	ADD_DATA(val);
+	val = MAX_SHIP_WEAPONS;
+	ADD_DATA(val);
 
-			memcpy(&(block[offset]), &(ishort), sizeof(short) );
-			offset += sizeof(short);
-		}
+	Assertion((((sizeof(short) + ((sizeof(short)+sizeof(short)) * MAX_SHIP_WEAPONS)) * MAX_WSS_SLOTS) + packet_size) < max_size, "Size of wss data exceeds max data size!");
 
-		// mwa -- old way below -- too much space
-		//memcpy(block+offset, &Wss_slots[i], sizeof(wss_unit));
-		//offset += sizeof(wss_unit);
+	for (i = 0; i < MAX_WSS_SLOTS; i++) {
+		ADD_SHORT(static_cast<short>(Wss_slots[i].ship_class));
+
+		for (j = 0; j < MAX_SHIP_WEAPONS; j++) {
+			ADD_SHORT(static_cast<short>(Wss_slots[i].wep[j]));
+			Assert(Wss_slots[i].wep_count[j] < SHRT_MAX);
+			ADD_SHORT(static_cast<short>(Wss_slots[i].wep_count[j]));
+		}
 	}
 
 	// any sound index
-	if(!sound.isValid()){
-		block[offset++] = 0xff;
-	} else {
-		block[offset++] = (ubyte)sound.value();
-	}
+	ADD_SHORT(static_cast<short>(sound.value()));
 
 	// add a netplayer address to identify who should play the sound
 	player_id = -1;
@@ -1428,20 +1421,19 @@ int store_wss_data(ubyte *block, int max_size, interface_snd_id sound,int player
 		player_id = Net_players[player_index].player_id;		
 	}
 
-	player_id = INTEL_SHORT( player_id );
-	memcpy(block+offset,&player_id,sizeof(player_id));
-	offset += sizeof(player_id);
+	ADD_SHORT(player_id);
 
-	Assert( offset < max_size );
-	return offset;
+	Assert( packet_size < static_cast<int>(max_size) );
+	return packet_size;
 }
 
-int restore_wss_data(ubyte *block)
+int restore_wss_data(ubyte *data)
 {
-	int	i, j, sanity, offset=0;
-	ubyte	b1, b2,sound;	
-	short ishort;
-	short player_id;	
+	int	i, j, offset = 0;
+	ubyte num_slots, num_weapons;
+	short b1, b2;
+	short player_id, sound;
+	ushort pool_size;
 
 	// this function assumes that the data is going to be used over the network
 	// so make a non-network version of this function if needed
@@ -1452,86 +1444,73 @@ int restore_wss_data(ubyte *block)
 		return 0;
 
 	// restore ship pool
-	sanity=0;
 	memset(Ss_pool, 0, MAX_SHIP_CLASSES*sizeof(int));
-	for (;;) {
-		if ( sanity++ > MAX_SHIP_CLASSES ) {
-			Int3();
-			break;
-		}
+	GET_USHORT(pool_size);
 
-		b1 = block[offset++];
-		if ( b1 == 0xff ) {
-			break;
-		}
-	
-		// take care of sign issues
-		b2 = block[offset++];
-		if(b2 == 0xff){
-			Ss_pool[b1] = -1;
-		} else {
+	for (i = 0; i < pool_size; i++) {
+		GET_SHORT(b1);
+		GET_SHORT(b2);
+
+		if (b1 < MAX_SHIP_CLASSES) {
 			Ss_pool[b1] = b2;
 		}
 	}
 
 	// restore weapons pool
-	sanity=0;
 	memset(Wl_pool, 0, MAX_WEAPON_TYPES*sizeof(int));
-	for (;;) {
-		if ( sanity++ > MAX_WEAPON_TYPES ) {
-			Int3();
-			break;
+	GET_USHORT(pool_size);
+
+	for (i = 0; i < pool_size; i++) {
+		GET_SHORT(b1);
+		GET_SHORT(b2);
+
+		if (b1 < MAX_SHIP_CLASSES) {
+			Wl_pool[b1] = b2;
 		}
+	}
 
-		b1 = block[offset++];
-		if ( b1 == 0xff ) {
-			break;
+
+	// restore unit data
+	for (i = 0; i < MAX_WSS_SLOTS; i++) {
+		Wss_slots[i].ship_class = -1;
+
+		for (j = 0; j < MAX_SHIP_WEAPONS; j++) {
+			Wss_slots[i].wep[j] = -1;
+			Wss_slots[i].wep_count[j] = 0;
 		}
-	
-		memcpy(&ishort, block+offset, sizeof(short));
-		offset += sizeof(short);
-		Wl_pool[b1] = INTEL_SHORT( ishort );
 	}
 
-	for ( i=0; i<MAX_WSS_SLOTS; i++ ) {
-		if(block[offset] == 0xff){
-			Wss_slots[i].ship_class = -1;
-		} else {
-			Wss_slots[i].ship_class = block[offset];
+	GET_DATA(num_slots);
+	GET_DATA(num_weapons);
+
+	for (i = 0; i < num_slots; i++) {
+		GET_SHORT(b1);
+
+		if (i < MAX_WSS_SLOTS) {
+			Wss_slots[i].ship_class = b1;
 		}
-		offset++;		
-		for ( j = 0; j < MAX_SHIP_WEAPONS; j++ ) {
-			// take care of sign issues
-			if(block[offset] == 0xff){
-				Wss_slots[i].wep[j] = -1;
-				offset++;
-			} else {
-				Wss_slots[i].wep[j] = (int)(block[offset++]);
+
+		for (j = 0; j < num_weapons; j++) {
+			GET_SHORT(b1);
+			GET_SHORT(b2);
+
+			if ( (i < MAX_WSS_SLOTS) && (j < MAX_SHIP_WEAPONS) ) {
+				Wss_slots[i].wep[j] = b1;
+				Wss_slots[i].wep_count[j] = b2;
 			}
-		
-			memcpy( &ishort, &(block[offset]), sizeof(short) );
-			ishort = INTEL_SHORT( ishort );
-			Wss_slots[i].wep_count[j] = (int)ishort;
-			offset += sizeof(short);
 		}
-
-		// mwa -- old way below
-		//memcpy(&Wss_slots[i], block+offset, sizeof(wss_unit));
-		//offset += sizeof(wss_unit);
 	}
 
 	// read in the sound data
-	sound = block[offset++];					// the sound index
+	GET_SHORT(sound);
 
 	// read in the player address
-	memcpy(&player_id,block+offset,sizeof(player_id));
-	player_id = INTEL_SHORT( player_id );
-	offset += sizeof(short);
+	GET_SHORT(player_id);
 
 	// determine if I'm the guy who should be playing the sound
 	if((Net_player != NULL) && (Net_player->player_id == player_id)){
 		// play the sound
-		if(sound != 0xff){
+		if (sound >= 0) {
 			gamesnd_play_iface(static_cast<InterfaceSounds>(sound));
 		}
 	}