From 062fed231a7109302578edd1acc0269f2f4cac94 Mon Sep 17 00:00:00 2001
From: mht8355 <mht8355@uncw.edu>
Date: Mon, 27 Apr 2020 21:22:12 -0400
Subject: [PATCH] change_lobby added for changing lobbies and leaving a room

---
 src/main.rs                      |  2 +-
 src/ship/packet/handler/lobby.rs | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 36dea68..4e06152 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -47,7 +47,7 @@ fn setup_logger() {
         .chain(std::io::stdout());
     let fileout = fern::Dispatch::new()
         .level(log::LevelFilter::Trace)
-        .chain(fern::log_file(format!("elseware-{}.log", chrono::Local::now().format("%Y-%m-%d"))).unwrap());
+        .chain(fern::log_file(format!("elseware-{}.log", chrono::Local::now().format("%Y-%m-%d_%H:%M:%S"))).unwrap());
     fern::Dispatch::new()
         .chain(stdio)
         .chain(fileout)
diff --git a/src/ship/packet/handler/lobby.rs b/src/ship/packet/handler/lobby.rs
index 9ac951d..8d0cba4 100644
--- a/src/ship/packet/handler/lobby.rs
+++ b/src/ship/packet/handler/lobby.rs
@@ -61,18 +61,26 @@ pub fn change_lobby(id: ClientId,
                     clients: &Clients,
                     level_table: &CharacterLevelTable)
                     -> Result<Vec<(ClientId, SendShipPacket)>, ShipError> {
+    let prev_area = client_location.get_area(id).unwrap();
     let leave_lobby = packet::builder::lobby::remove_from_lobby(id, client_location).unwrap();
     let old_neighbors = client_location.get_client_neighbors(id).unwrap();
-    let lobby = LobbyId(requested_lobby as usize);
+    let mut lobby = LobbyId(requested_lobby as usize);
     match client_location.add_client_to_lobby(id, lobby) {
         Ok(lobby) => {
         }
         Err(err) => {
-            let dialog = SmallDialog {
-                padding: [0, 0],
-                msg: String::from("Lobby is full."),
-            };
-            return Ok(vec![(id, SendShipPacket::SmallDialog(dialog))])
+            match prev_area {
+                RoomLobby::Lobby(lobby) => {
+                    let dialog = SmallDialog {
+                        padding: [0, 0],
+                        msg: String::from("Lobby is full."),
+                    };
+                    return Ok(vec![(id, SendShipPacket::SmallDialog(dialog))])
+                }
+                RoomLobby::Room(room) => {
+                    lobby = client_location.add_client_to_next_available_lobby(id, lobby).unwrap();
+                }
+            }
         }
     }
     let join_lobby = packet::builder::lobby::join_lobby(id, lobby, client_location, clients, level_table)?;