(player_login, player_main): Move the C_INIT that terminates the login

phase to player_login().  No functional change.
(showvers): Trivial, used just once.  Inline, remove.

diff --git a/include/prototypes.h b/include/prototypes.h
index 20fc486ce7f83052bfba3c98920c1f287131053e..837c6e3e47cb097e36c9f030d8bbc89935bd010d 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -609,7 +609,6 @@ extern void pr_hilite(s_char *buf);
 extern void prredir(s_char *redir);
 extern void prexec(s_char *file);
 extern void prprompt(int min, int btu);
 extern void prredir(s_char *redir);
 extern void prexec(s_char *file);
 extern void prprompt(int min, int btu);

-extern void showvers(int vers);

 extern int prmptrd(char *prompt, char *str, int size);
 extern int uprmptrd(char *prompt, char *str /* str is message text */,
                    int size);
 extern int prmptrd(char *prompt, char *str, int size);
 extern int uprmptrd(char *prompt, char *str /* str is message text */,
                    int size);

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 015352cd8685cad806a32cc66a7e610691502013..6b1a528b8e5886303b0e563d35e781e17e3761a1 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -64,8 +64,8 @@ extern struct cmndstr login_coms[];
 void
 player_login(void *ud)
 {
 void
 player_login(void *ud)
 {

-    s_char buf[128];
-    s_char space[128];
+    char buf[128];
+    char space[128];

     int ac;
     int cmd;
 
     int ac;
     int cmd;
 


@@ -306,6 +306,7 @@ play_cmd(void)
        io_shutdown(player->iop, IO_READ);
        return RET_FAIL;
     }
        io_shutdown(player->iop, IO_READ);
        return RET_FAIL;
     }

+    pr_id(player, C_INIT, "%d\n", CLIENTPROTO);

     player_main(player);
     player->state = PS_SHUTDOWN;
     return RET_OK;
     player_main(player);
     player->state = PS_SHUTDOWN;
     return RET_OK;

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 36db62dac347bd45db5f39aeb1090492c651b7d6..e465235af8c896f52f879b4fa2489225b95aa073 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -72,7 +72,6 @@ player_main(struct player *p)
     player = p;
     time(&player->lasttime);
     time(&player->curup);
     player = p;
     time(&player->lasttime);
     time(&player->curup);

-    showvers(CLIENTPROTO);

     show_motd();
     if (init_nats() < 0)
        return;
     show_motd();
     if (init_nats() < 0)
        return;

diff --git a/src/lib/subs/pr.c b/src/lib/subs/pr.c
index f6dcd1c9db63e4b1c41a90c2dfd02cebe98b97c4..0eee125eaf3a71992dfb91c113709042115892ef 100644 (file)
--- a/src/lib/subs/pr.c
+++ b/src/lib/subs/pr.c
@@ -297,12 +297,6 @@ prprompt(int min, int btu)
     pr_id(player, C_PROMPT, "%d %d\n", min, btu);
 }
 
     pr_id(player, C_PROMPT, "%d %d\n", min, btu);
 }
 

-void
-showvers(int vers)
-{
-    pr_id(player, C_INIT, "%d\n", vers);
-}
-

 int
 prmptrd(char *prompt, char *str, int size)
 {
 int
 prmptrd(char *prompt, char *str, int size)
 {