X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Fclient%2Fmisc.h;h=e33f1460d5a8e208a8a108b1946c36b0509ad896;hp=c908e5596bc046452d199f1a51b7b776fa99a57f;hb=2ae769bec4634796f5d4679a1f2279efd4d11fe5;hpb=801d32783dda0325a00cb9ec3397d706dbfa5c08
diff --git a/src/client/misc.h b/src/client/misc.h
index c908e5596..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-2005, 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,64 +14,73 @@
* 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 .
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* misc.h: Misc client definitions
- *
+ *
* Known contributors to this file:
* Steve McClure, 1998
+ * Markus Armbruster, 2004-2020
*/
-#ifndef _MISC_H_
-#define _MISC_H_
+#ifndef MISC_H
+#define MISC_H
-#include
#include
-#include
-#ifdef _WIN32
-#include
-#include
-#else
-#include
-#endif
-typedef short coord; /* also change NSC_COORD in nsc.h */
-
-struct ioqueue;
+#define MAX(a, b) ((a) >= (b) ? (a) : (b))
+#define MIN(a,b) ((a) < (b) ? (a) : (b))
extern char empirehost[];
extern char empireport[];
-extern int interrupt;
-extern char num_teles[];
-extern int sock;
-extern char *SO;
-extern char *SE;
-#ifdef _WIN32
-HANDLE hStdIn;
-#endif
-
-void getsose(void);
+/* expect.c */
+int recvline(int s, char *buf);
+int parseid(char *);
int expect(int s, int match, char *buf);
-int handleintr(int);
-int hostaddr(char *name, struct sockaddr_in *addr);
-int hostconnect(struct sockaddr_in *addr);
-int hostport(char *name, struct sockaddr_in *addr);
-int login(int s, char *uname, char *cname, char *cpass, int kill_proc);
-void saveargv(int ac, char **src, char **dst);
void sendcmd(int s, char *cmd, char *arg);
-int sendeof(int sock);
-void servercmd(struct ioqueue *ioq, FILE *auxfi);
-int serverio(int s, struct ioqueue *ioq);
-int termio(int fd, int sock, FILE *auxfi);
+
+/* 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 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);
+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
+#define snprintf _snprintf
+#endif
#endif