Rewrite much of client's playing phase code:

[empserver] / src / client / misc.h

diff --git a/src/client/misc.h b/src/client/misc.h
index 2dc3bbd3c4b8d2b88e0967167f08b4770ea6051a..ee9c9e064851cf6cc2891a7bd3f0dd6bc88e7648 100644 (file)
--- a/src/client/misc.h
+++ b/src/client/misc.h
@@ -39,19 +39,16 @@
 #include <windows.h>
 #endif
 
-struct ioqueue;
+#define MAX(a, b) ((a) >= (b) ? (a) : (b))
 
 extern char empirehost[];
 extern char empireport[];
 extern int eight_bit_clean;
-extern int sock;
+extern int input_fd;
+extern FILE *auxfp;
 extern char *SO;
 extern char *SE;
 
-#ifdef _WIN32
-extern HANDLE hStdIn;
-#endif
-
 #ifdef _WIN32
 #define getsose() ((void)0)
 #define putso() ((void)0)
@@ -67,9 +64,9 @@ 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(struct ioqueue *ioq, FILE *auxfi);
-int serverio(int s, struct ioqueue *ioq);
-int termio(int fd, int sock, FILE *auxfi);
+void servercmd(int, char *, int);
+void outch(char);
 
 #endif