client: Reorder misc.h, and point to the .c

[empserver] / src / client / misc.h

diff --git a/src/client/misc.h b/src/client/misc.h
index ee9c9e064851cf6cc2891a7bd3f0dd6bc88e7648..e33f1460d5a8e208a8a108b1946c36b0509ad896 100644 (file)
--- a/src/client/misc.h
+++ b/src/client/misc.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,47 +25,62 @@
  *  ---
  *
  *  misc.h: Misc client definitions
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2020
  */
 
 #ifndef MISC_H
 #define MISC_H
 
 #include <stdio.h>
-#ifdef _WIN32
-#include <windows.h>
-#endif
 
 #define MAX(a, b) ((a) >= (b) ? (a) : (b))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 extern char empirehost[];
 extern char empireport[];
+
+/* expect.c */
+int recvline(int s, char *buf);
+int parseid(char *);
+int expect(int s, int match, char *buf);
+void sendcmd(int s, char *cmd, char *arg);
+
+/* host.c */
+int tcp_connect(char *, char *);
+
+/* login.c */
+int login(int s, char *uname, char *cname, char *cpass, int kill_proc, int);
+
+/* play.c */
+int play(int, char *);
+void prompt(int, char *, char *);
+
+/* servcmd.c */
 extern int eight_bit_clean;
-extern int input_fd;
 extern FILE *auxfp;
-extern char *SO;
-extern char *SE;
+extern int restricted;
+int servercmd(int, char *, int);
+void outch(char);
 
-#ifdef _WIN32
+/* termlib.c */
+#ifdef HAVE_CURSES_TERMINFO
+void getsose(void);
+void putso(void);
+void putse(void);
+#else  /* !HAVE_CURSES_TERMINFO */
 #define getsose() ((void)0)
 #define putso() ((void)0)
 #define putse() ((void)0)
+#endif /* !HAVE_CURSES_TERMINFO */
+
+/* Compatibility gunk for Windows */
+#ifdef _MSC_VER
 #define pclose _pclose
 #define popen _popen
-#else
-void getsose(void);
-void putso(void);
-void putse(void);
+#define snprintf _snprintf
 #endif
-int recvline(int s, char *buf);
-int expect(int s, int match, char *buf);
-int tcp_connect(char *, char *);
-int login(int s, char *uname, char *cname, char *cpass, int kill_proc, int);
-int play(int);
-void sendcmd(int s, char *cmd, char *arg);
-void servercmd(int, char *, int);
-void outch(char);
 
 #endif