Engine: Switch to mmulti.cpp from EDuke32-OldMP repo. Loses IPv6 support, but...

Engine: Switch to mmulti.cpp from EDuke32-OldMP repo. Loses IPv6 support, but gains stability and XP support.

source/build/include/mmulti.h

@@ -6,46 +6,45 @@
 // by Jonathon Fowler (jf@jonof.id.au)
 // by the EDuke32 team (development@voidpoint.com)
 
-#ifndef mmulti_h
-#define mmulti_h
+#ifndef mmulti_h_
+#define mmulti_h_
 
-#include "build.h"
+#define MAXMULTIPLAYERS 16
 
-#define MMULTI_MODE_MS  0
-#define MMULTI_MODE_P2P 1
+extern int myconnectindex, numplayers;
+extern int connecthead, connectpoint2[MAXMULTIPLAYERS];
+extern char syncstate;
+extern int natfree; //Addfaz NatFree
 
-extern int myconnectindex, numplayers, networkmode;
-extern int connecthead, connectpoint2[MAXPLAYERS];
-extern unsigned char syncstate;
-
-void initsingleplayers(void);
-void initmultiplayers(int argc, char const * const argv[]);
-int initmultiplayersparms(int argc, char const * const argv[]);
+int initmultiplayersparms(int argc, char **argv);
 int initmultiplayerscycle(void);
 
-void setpackettimeout(int datimeoutcount, int daresendagaincount);
-void uninitmultiplayers(void);
-void sendlogon(void);
-void sendlogoff(void);
-int getoutputcirclesize(void);
-void setsocket(int newsocket);
-void sendpacket(int other, unsigned char *bufptr, int messleng);
-int getpacket(int *other, unsigned char *bufptr);
-void flushpackets(void);
-void genericmultifunction(int other, unsigned char *bufptr, int messleng, int command);
-
-#define mmulti_initsingleplayers initsingleplayers
-#define mmulti_initmultiplayers initmultiplayers
-#define mmulti_initmultiplayersparms initmultiplayersparms
-#define mmulti_initmultiplayerscycle initmultiplayerscycle
-#define mmulti_setpackettimeout setpackettimeout
-#define mmulti_uninitmultiplayers uninitmultiplayers
-#define mmulti_sendlogon sendlogon
-#define mmulti_sendlogoff sendlogoff
-#define mmulti_sendpacket sendpacket
-#define mmulti_getpacket getpacket
-#define mmulti_flushpackets flushpackets
-#define mmulti_genericmultifunction genericmultifunction
-
-#endif	// mmulti_h
+void mmulti_initmultiplayers(int argc, char **argv, char damultioption, char dacomrateoption, char dapriority);
+void mmulti_setpackettimeout(int datimeoutcount, int daresendagaincount);
+void mmulti_uninitmultiplayers(void);
+void mmulti_sendlogon(void);
+void mmulti_sendlogoff(void);
+int mmulti_getoutputcirclesize(void);
+void mmulti_sendpacket(int other, unsigned char *bufptr, int messleng);
+int mmulti_getpacket(int *other, unsigned char *bufptr);
+void mmulti_flushpackets(void);
+void mmulti_generic(int other, unsigned char *bufptr, int messleng, int command);
+int isvalidipaddress(char *st);
+
+void nfIncCP(void); //Addfaz NatFree
+int nfCheckHF(int other); //Addfaz NatFree
+int nfCheckCP(int other); //Addfaz NatFree
+
+#define initmultiplayers mmulti_initmultiplayers
+#define sendpacket mmulti_sendpacket
+#define setpackettimeout mmulti_setpackettimeout
+#define uninitmultiplayers mmulti_uninitmultiplayers
+#define sendlogon mmulti_sendlogon
+#define sendlogoff mmulti_sendlogoff
+#define getoutputcirclesize mmulti_getoutputcirclesize
+#define getpacket mmulti_getpacket
+#define flushpackets mmulti_flushpackets
+#define genericmultifunction mmulti_generic
+
+#endif  // mmulti_h_