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

The previous rev. was committed accidentally, revert.

Browse source
This commit is contained in:
Ron Koenderink 2004-12-30 02:51:12 +00:00
parent 70fcb70707
commit b3ec8c14da
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/prototypes.h
View file

@ -421,33 +421,28 @@ extern int pln_identchance(struct plnstr *, int, int);
extern void pln_set_tech(struct plnstr *, int); extern void pln_set_tech(struct plnstr *, int);
/* pr.c */ /* pr.c */
extern void pr(s_char *, ...) ATTRIBUTE((format (printf, 1, 2))); extern void pr(s_char *, ...) ATTRIBUTE((format (printf, 1, 2)));
extern void UTF8prnf(s_char *buf); extern void prnf(s_char *buf);
extern void pr_id(struct player *, int, s_char *, ...) extern void pr_id(struct player *, int, s_char *, ...)
ATTRIBUTE((format (printf, 3, 4))); ATTRIBUTE((format (printf, 3, 4)));
extern void pr_flash(struct player *, s_char *, ...) extern void pr_flash(struct player *, s_char *, ...)
ATTRIBUTE((format (printf, 2, 3))); ATTRIBUTE((format (printf, 2, 3)));
extern void UTF8pr_flash(struct player *, s_char *, ...)
ATTRIBUTE((format (printf, 2, 3)));
extern void pr_inform(struct player *, s_char *, ...) extern void pr_inform(struct player *, s_char *, ...)
ATTRIBUTE((format (printf, 2, 3))); ATTRIBUTE((format (printf, 2, 3)));
extern void pr_wall(s_char *, ...) extern void pr_wall(s_char *, ...)
ATTRIBUTE((format (printf, 1, 2))); ATTRIBUTE((format (printf, 1, 2)));
extern void pr_player(struct player *pl, int id, s_char *buf); extern void pr_player(struct player *pl, int id, s_char *buf);
extern void UTF8pr_player(struct player *pl, int id, s_char *buf);
extern void pr_hilite(s_char *buf); 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 void showvers(int vers);
extern int prmptrd(s_char *prompt, s_char *str, int size); extern int prmptrd(s_char *prompt, s_char *str, int size);
extern int UTF8prmptrd(s_char *prompt, s_char *str, int size);
extern void prdate(void); extern void prdate(void);
extern void prxy(s_char *format, coord x, coord y, natid country); extern void prxy(s_char *format, coord x, coord y, natid country);
extern void PR(int, s_char *, ...) ATTRIBUTE((format (printf, 2, 3))); extern void PR(int, s_char *, ...) ATTRIBUTE((format (printf, 2, 3)));
extern void PRdate(natid cn); extern void PRdate(natid cn);
extern void pr_beep(void); extern void pr_beep(void);
extern void mpr(int, s_char *, ...) ATTRIBUTE((format (printf, 2, 3))); extern void mpr(int, s_char *, ...) ATTRIBUTE((format (printf, 2, 3)));
extern void prtoascii(s_char *buf);
/* radmap.c */ /* radmap.c */
extern int deltx(struct range *, coord); extern int deltx(struct range *, coord);

9
src/server/main.c
View file

@ -415,7 +415,7 @@ panic(int sig)
void void
shutdwn(int sig) shutdwn(int sig)
{ {
struct player *p,*phold; struct player *p;
time_t now; time_t now;
#if defined(__linux__) && defined(_EMPTH_POSIX) #if defined(__linux__) && defined(_EMPTH_POSIX)
@ -443,8 +443,7 @@ shutdwn(int sig)
logerror("Shutdown commencing (cleaning up threads.)"); logerror("Shutdown commencing (cleaning up threads.)");
p = player_next(0); for (p = player_next(0); p != 0; p = player_next(p)) {
while (p != 0) {
if (p->state != PS_PLAYING) if (p->state != PS_PLAYING)
continue; continue;
pr_flash(p, "Server shutting down...\n"); pr_flash(p, "Server shutting down...\n");
@ -453,9 +452,7 @@ shutdwn(int sig)
if (p->command) { if (p->command) {
pr_flash(p, "Shutdown aborting command\n"); pr_flash(p, "Shutdown aborting command\n");
} }
phold = p; empth_wakeup(p->proc);
p = player_next(p);
empth_wakeup(phold->proc);
} }
if (!sig) { if (!sig) {