data work

1 files changed, 15 insertions, 5 deletions

diff --git a/src/login.c b/src/login.c
index 9eba897..b38fdd1 100644
--- a/src/login.c
+++ b/src/login.c
@@ -38,7 +38,7 @@ int step_login(playerc_t *player, int conn_fd) {
 
   for (;;) {
     switch (player->state) {
-    case LoggedOut: /* the player has yet to log in, this is a fresh connection!
+    case LoggedOut: ; /* the player has yet to log in, this is a fresh connection!
                      */
       printf("The player is logged out\n");
       send_to_fd(player->conn,
@@ -58,16 +58,22 @@ int step_login(playerc_t *player, int conn_fd) {
         recv(player->conn, buf, sizeof(buf), 0);
         if (buf[0] == 'y') {
           player->state = WantMakeAccount;
+          break;
         } else if (buf[0] == 'n') {
           send_to_fd(player->conn,
                      "Awww :(. Oh well, hope to see you again soon!\n");
           return 4;
         }
-        continue;
+        break;
       } else {
-        player->state = LoggedOut;
-        continue;
+        player->state = EnterPassword;
+        break;
       }
+    case EnterPassword: ;
+      asprintf(&buf, "Welcome back %s! Please enter your password, so we can confirm it.\n", player->plr.name);
+      send_to_fd(player->conn, buf);
+      recv(player->conn, buf, sizeof(buf), 0);
+      break;
     case WantMakeAccount:
       asprintf(&buf, "Welcome aboard %s! Why don't you start us off by giving me a password.\n", player->plr.name);
       send_to_fd(player->conn, buf);
@@ -83,7 +89,7 @@ int step_login(playerc_t *player, int conn_fd) {
                 send_to_fd(player->conn, "Uhhh, something happened. Try again.");
                 printf("%d\n", err);
                 player->state = LoggedOut;
-                continue;
+                break;
             } else {
                 send_to_fd(player->conn, "Sounds good! let's drop you into a world!");
                 player->state = Complete;
@@ -91,10 +97,14 @@ int step_login(playerc_t *player, int conn_fd) {
                 player->plr.level = 1;
                 player->plr.xp = 0;
                 player->plr.location_id = 0;
+                printf("Trying to write player\n");
                 try_write_plr(&player->plr);
+                printf("Done\n");
                 player->state = Complete; 
             }
         }
+    case Complete: ;
+        return 0;
     }
   }