eliminate ServerBehavior::DATA_SERVER_BB

src/ReceiveCommands.cc

@@ -175,7 +175,6 @@ void on_connect(std::shared_ptr<Client> c) {
       send_server_init(c, 0);
       break;
 
-    case ServerBehavior::DATA_SERVER_BB:
     case ServerBehavior::LOBBY_SERVER:
       send_server_init(c, 0);
       break;
@@ -257,10 +256,9 @@ static void send_main_menu(shared_ptr<Client> c) {
 }
 
 void on_login_complete(shared_ptr<Client> c) {
-  // On the BB data server, this function is called only on the last connection
-  // (when we should send the ship select menu).
-  if ((c->server_behavior == ServerBehavior::LOGIN_SERVER) ||
-      (c->server_behavior == ServerBehavior::DATA_SERVER_BB)) {
+  // On BB, this function is called when the data server phase is done (and we
+  // should send the ship select menu), so we don't need to check for it here.
+  if (c->server_behavior == ServerBehavior::LOGIN_SERVER) {
     auto s = c->require_server_state();
 
     // On the login server, send the events/songs, ep3 updates, and the main

src/Version.cc

@@ -163,8 +163,6 @@ const char* name_for_enum<ServerBehavior>(ServerBehavior behavior) {
       return "login_server";
     case ServerBehavior::LOBBY_SERVER:
       return "lobby_server";
-    case ServerBehavior::DATA_SERVER_BB:
-      return "data_server_bb";
     case ServerBehavior::PATCH_SERVER_PC:
       return "patch_server_pc";
     case ServerBehavior::PATCH_SERVER_BB:
@@ -179,12 +177,10 @@ template <>
 ServerBehavior enum_for_name<ServerBehavior>(const char* name) {
   if (!strcasecmp(name, "pc_console_detect")) {
     return ServerBehavior::PC_CONSOLE_DETECT;
-  } else if (!strcasecmp(name, "login_server") || !strcasecmp(name, "login")) {
+  } else if (!strcasecmp(name, "login_server") || !strcasecmp(name, "login") || !strcasecmp(name, "data_server_bb")) {
     return ServerBehavior::LOGIN_SERVER;
   } else if (!strcasecmp(name, "lobby_server") || !strcasecmp(name, "lobby")) {
     return ServerBehavior::LOBBY_SERVER;
-  } else if (!strcasecmp(name, "data_server_bb") || !strcasecmp(name, "data_server") || !strcasecmp(name, "data")) {
-    return ServerBehavior::DATA_SERVER_BB;
   } else if (!strcasecmp(name, "patch_server_pc") || !strcasecmp(name, "patch_pc")) {
     return ServerBehavior::PATCH_SERVER_PC;
   } else if (!strcasecmp(name, "patch_server_bb") || !strcasecmp(name, "patch_bb")) {

src/Version.hh

@@ -104,7 +104,6 @@ enum class ServerBehavior {
   PC_CONSOLE_DETECT = 0,
   LOGIN_SERVER,
   LOBBY_SERVER,
-  DATA_SERVER_BB,
   PATCH_SERVER_PC,
   PATCH_SERVER_BB,
   PROXY_SERVER,