(copy_ascii_no_funny, copy_utf8_no_funny)

[empserver] / include / prototypes.h

diff --git a/include/prototypes.h b/include/prototypes.h
index 8e41758ab1ac13296a4ad8bc5d65b435b57af1e2..91699e4b50f82c1d2ad7e0abd85bad3f391a0744 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -45,14 +45,11 @@
 #include "commodity.h"
 
 /* src/server/main.c */
-extern void close_files(void);
 extern void panic(int sig);
 extern void shutdwn(int sig);
-extern void init_server(int);
+extern void init_server(void);
 extern void start_server(int);
-#if defined(_WIN32)
-extern void loc_NTTerm(void);
-#endif
+extern void finish_server(void);
 
 /*****************************************************************************
  * src/lib/ * / *.c 
@@ -66,7 +63,8 @@ extern void loc_NTTerm(void);
  */
 extern int check_market(void);
 extern void set_coastal(struct sctstr *);
-extern int sendmessage(struct natstr *, struct natstr *, char *, int);
+extern int sendmessage(struct natstr *, struct natstr *, char *message
+                      /* message is message text */, int);
 extern void gift(int, int, s_char *, int, s_char *);
 extern int display_mark(i_type, int);
 extern int want_to_abandon(struct sctstr *, i_type, int, struct lndstr *);
@@ -139,7 +137,6 @@ int give(void);
 int grin(void);
 int hard(void);
 int head(void);
-int hidd(void);
 int improve(void);
 int info(void);
 int land(void);
@@ -186,6 +183,7 @@ int path(void);
 int payo(void);
 int pboa(void);
 int pdump(void);
+int peek(void);
 int plan(void);
 int play(void);
 int powe(void);
@@ -307,8 +305,8 @@ extern int has_units_with_mob(coord, coord, natid);
 extern int adj_units(coord, coord, natid);
 extern int has_helpful_engineer(coord x, coord y, natid cn);
 /* log.c */
-extern void loginit(s_char *);
-extern void logerror(s_char *, ...) ATTRIBUTE((format (printf, 1, 2)));
+extern void loginit(char *);
+extern void logerror(char *, ...) ATTRIBUTE((format (printf, 1, 2)));
 extern int oops(char *, char *, int);
 /* maps.c */
 extern int draw_map(int, s_char, int, struct nstr_sect *, int);
@@ -388,8 +386,7 @@ extern int min(int, int);
 #endif
 extern s_char *effadv(int);
 extern int onearg(s_char *, s_char *);
-extern int parse(register s_char *, s_char **, s_char **, s_char *,
-                s_char **);
+extern int parse(char *, char **, char **, char *, char **);
 extern int ldround(double, int);
 extern int roundintby(int, int);
 extern int scthash(register int, register int, int);
@@ -419,9 +416,9 @@ extern void player_wakeup_all(natid);
 extern void player_wakeup(struct player *);
 extern void player_accept(void *);
 /* dispatch.c */
-extern int dispatch(s_char *, s_char *);
+extern int dispatch(char *, char *);
 /* empdis.c */
-extern int getcommand(s_char *);
+extern int getcommand(char *);
 extern void init_player_commands(void);
 extern void log_last_commands(void);
 extern int gamedown(void);
@@ -448,7 +445,7 @@ extern int command(void);
 extern int recvclient(s_char *, int);
 
 /* service.c */
-extern int service_stopped(void);
+extern void stop_service(void);
 /* more in service.h */
 
 /*
@@ -487,7 +484,7 @@ extern void emp_setbit(int, int, u_char *);
 extern void emp_setbitmap(int, int, u_char *, int *);
 extern void bitinit2(struct nstr_sect *, u_char *, int);
 /* getele.c */
-extern int getele(s_char *, s_char *);
+extern int getele(char *, char *);
 /* land.c */
 extern s_char *prland(struct lndstr *);
 extern int lnd_postread(int, s_char *);
@@ -594,29 +591,37 @@ extern int pln_damage(struct plnstr *, coord, coord, s_char, int *, int);
 extern int pln_identchance(struct plnstr *, int, int);
 extern void pln_set_tech(struct plnstr *, int);
 /* pr.c */
-extern void pr(s_char *, ...) ATTRIBUTE((format (printf, 1, 2)));
-extern void prnf(s_char *buf);
+extern void pr(char *, ...) ATTRIBUTE((format (printf, 1, 2)));
+extern void uprnf(char *buf /* buf is message text */);
 extern void pr_id(struct player *, int, s_char *, ...)
                ATTRIBUTE((format (printf, 3, 4)));
-extern void pr_flash(struct player *, s_char *, ...)
+extern void pr_flash(struct player *, char *format
+                    /* format is message text */, ...)
                ATTRIBUTE((format (printf, 2, 3)));
 extern void pr_inform(struct player *, s_char *, ...)
                ATTRIBUTE((format (printf, 2, 3)));
 extern void pr_wall(s_char *, ...)
                ATTRIBUTE((format (printf, 1, 2)));
 extern void pr_player(struct player *pl, int id, s_char *buf);
+extern void upr_player(struct player *pl, int id, char *buf
+                                 /* buf is message text */);
 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 showvers(int vers);
-extern int prmptrd(s_char *prompt, s_char *str, int size);
+extern int prmptrd(char *prompt, char *str, int size);
+extern int uprmptrd(char *prompt, char *str /* str is message text */,
+                   int size);
 extern void prdate(void);
 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 PRdate(natid cn);
 extern void pr_beep(void);
 extern void mpr(int, s_char *, ...) ATTRIBUTE((format (printf, 2, 3)));
+extern size_t copy_ascii_no_funny(char *, char *);
+extern size_t copy_utf8_no_funny(char *, char *);
+extern size_t copy_utf8_to_ascii_no_funny(char *, char *);
+extern int ufindpfx(char *, int);
 
 /* radmap.c */
 extern int deltx(struct range *, coord);
@@ -712,8 +717,8 @@ extern int trechk(register natid, register natid, int);
 /* in item.h */
 /* wu.c */
 extern void clear_telegram_is_new(natid);
-extern int typed_wu(natid, natid, s_char *, int);
-extern int wu(natid, natid, s_char *, ...) ATTRIBUTE((format (printf, 3, 4)));
+extern int typed_wu(natid, natid, char *, int);
+extern int wu(natid, natid, char *, ...) ATTRIBUTE((format (printf, 3, 4)));
 
 /*
  * src/lib/update/ *.c 
@@ -767,7 +772,7 @@ extern int load_it(struct shpstr *, struct sctstr *,
 extern void unload_it(struct shpstr *);
 extern void auto_fuel_ship(struct shpstr *);
 /* nxtitemp.c */
-extern s_char *nxtitemp(struct nstr_item *, int);
+extern s_char *nxtitemp(struct nstr_item *);
 /* nxtsctp.c */
 extern struct sctstr *nxtsctp(register struct nstr_sect *);
 /* plague.c */