empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
phase to player_login().  No functional change.
(showvers): Trivial, used just once.  Inline, remove.
This commit is contained in:
Markus Armbruster 2005-06-13 09:45:32 +00:00
parent ac671d25e4
commit 58a0d40777
4 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/prototypes.h
View file

@ -609,7 +609,6 @@ extern void pr_hilite(s_char *buf);
extern void prredir(s_char *redir); extern void prredir(s_char *redir);
extern void prexec(s_char *file); extern void prexec(s_char *file);
extern void prprompt(int min, int btu); extern void prprompt(int min, int btu);
extern void showvers(int vers);
extern int prmptrd(char *prompt, char *str, int size); extern int prmptrd(char *prompt, char *str, int size);
extern int uprmptrd(char *prompt, char *str /* str is message text */, extern int uprmptrd(char *prompt, char *str /* str is message text */,
int size); int size);

5
src/lib/player/login.c
View file

@ -64,8 +64,8 @@ extern struct cmndstr login_coms[];
void void
player_login(void *ud) player_login(void *ud)
{ {
s_char buf[128]; char buf[128];
s_char space[128]; char space[128];
int ac; int ac;
int cmd; int cmd;
@ -306,6 +306,7 @@ play_cmd(void)
io_shutdown(player->iop, IO_READ); io_shutdown(player->iop, IO_READ);
return RET_FAIL; return RET_FAIL;
} }
pr_id(player, C_INIT, "%d\n", CLIENTPROTO);
player_main(player); player_main(player);
player->state = PS_SHUTDOWN; player->state = PS_SHUTDOWN;
return RET_OK; return RET_OK;

1
src/lib/player/player.c
View file

@ -72,7 +72,6 @@ player_main(struct player *p)
player = p; player = p;
time(&player->lasttime); time(&player->lasttime);
time(&player->curup); time(&player->curup);
showvers(CLIENTPROTO);
show_motd(); show_motd();
if (init_nats() < 0) if (init_nats() < 0)
return; return;

6
src/lib/subs/pr.c
View file

@ -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 int
prmptrd(char *prompt, char *str, int size) prmptrd(char *prompt, char *str, int size)
{ {