snis_server: if you join the wrong system, redirect to the right one

as if going through a warp gate.

Signed-off-by: Stephen M. Cameron <[email protected]>

Author: smcameron

snis_client.c

@@ -781,6 +781,7 @@ static void format_date(char *buf, int bufsize, double date)
 static int switched_server = -1;
 static char switch_server_location_string[20] = { 0 };
 static int switch_warp_gate_number = -1;
+static int switch_with_redirection = 0;
 static int switched_server2 = -1;
 static int writer_thread_should_die = 0;
 static int writer_thread_alive = 0;
@@ -7303,7 +7304,12 @@ static int process_switch_server(void)
 	switch_warp_gate_number = packed_buffer_extract_u8(&pb);
 	packed_buffer_extract_raw(&pb, switch_server_location_string, 20);
 	switch_server_location_string[19] = '\0';
-	enforce_solarsystem = 0; /* get past multiverse solarsystem verification for warp gates */
+	if (switch_warp_gate_number != 255) {
+		enforce_solarsystem = 0; /* get past multiverse solarsystem verification for warp gates */
+		switch_with_redirection = 0;
+	} else {
+		switch_with_redirection = 1;
+	}
 	return 0;
 }
 
@@ -22473,9 +22479,13 @@ static int main_da_expose(SDL_Window *window)
 		if (!(o = find_my_ship())) {
 			char msg[100];
 			if (how_long_to_wait == -1)
-				how_long_to_wait = 4 * frame_rate_hz;
+				how_long_to_wait = 2 * frame_rate_hz;
 			if (how_long_to_wait > 0) {
-				snprintf(msg, sizeof(msg) - 1,
+				if (switch_with_redirection)
+					snprintf(msg, sizeof(msg) - 1,
+						"WRONG STAR SYSTEM BUDDY, REDIRECTING . . .");
+				else
+					snprintf(msg, sizeof(msg) - 1,
 						"PREPARE FOR THE JUMP TO LIGHTSPEED, SPACE NERD");
 				how_long_to_wait--;
 			}

snis_server.c

@@ -25116,18 +25116,26 @@ static void *per_client_write_thread(__attribute__((unused)) void /* struct game
 
 		if (player_error) {
 			pb = packed_buffer_allocate(256);
-			packed_buffer_append(pb, "bb", OPCODE_ADD_PLAYER_ERROR, player_error);
 			if (player_error == ADD_PLAYER_ERROR_WRONG_SOLARSYSTEM) {
+#if 0
+				/* Tell player the right server */
 				packed_buffer_append_u16(pb,
 					(uint16_t) strlen(bridgelist[c->bridge].resident_solarsystem));
 				packed_buffer_append_raw(pb, bridgelist[c->bridge].resident_solarsystem,
 						strlen(bridgelist[c->bridge].resident_solarsystem));
+#else
+				/* Automatically switch the player to the correct server */
+				packed_buffer_append(pb, "bb", OPCODE_SWITCH_SERVER, (uint8_t) 255);
+				uppercase(bridgelist[c->bridge].resident_solarsystem);
+				packed_buffer_append_raw(pb, bridgelist[c->bridge].resident_solarsystem, 20);
+#endif
 			} else {
+				packed_buffer_append(pb, "bb", OPCODE_ADD_PLAYER_ERROR, player_error);
 				packed_buffer_append_u16(pb, (uint16_t) 1);
 				packed_buffer_append_raw(pb, "x", 1);
+				disconnect_timer = 1.0;
 			}
 			pb_queue_to_client(c, pb);
-			disconnect_timer = 1.0;
 		}
 
 		currentTime = time_now_double();