X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Fclient%2Fmisc.h;h=e33f1460d5a8e208a8a108b1946c36b0509ad896;hp=de7996450c5d408517fb50dbe7d94ef5dc7025e9;hb=2ae769bec4634796f5d4679a1f2279efd4d11fe5;hpb=dfb6620203b0bfe434d8a01afad82bb905305312
diff --git a/src/client/misc.h b/src/client/misc.h
index de7996450..e33f1460d 100644
--- 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-2009, 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 .
*
* ---
*
@@ -29,26 +28,44 @@
*
* Known contributors to this file:
* Steve McClure, 1998
+ * Markus Armbruster, 2004-2020
*/
#ifndef MISC_H
#define MISC_H
#include
-#ifdef _WIN32
-#include "sysdep_w32.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 int send_eof;
extern FILE *auxfp;
+extern int restricted;
+int servercmd(int, char *, int);
+void outch(char);
+/* termlib.c */
#ifdef HAVE_CURSES_TERMINFO
void getsose(void);
void putso(void);
@@ -58,14 +75,12 @@ void putse(void);
#define putso() ((void)0)
#define putse() ((void)0)
#endif /* !HAVE_CURSES_TERMINFO */
-int recvline(int s, char *buf);
-int parseid(char *);
-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);
+
+/* Compatibility gunk for Windows */
+#ifdef _MSC_VER
+#define pclose _pclose
+#define popen _popen
+#define snprintf _snprintf
+#endif
#endif