Backport r7084 to trunk also.

"remove dead code left in accidentally
Move a enum to netplay.h, and fix #include files so netplay.h comes before multiint.h"




git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7085 4a71c877-e1ca-e34f-864e-861f7616d084

lib/netplay/netplay.c

@@ -63,19 +63,6 @@ unsigned int masterserver_port = 0, gameserver_port = 0;
 */
 #define NET_BUFFER_SIZE	(MaxMsgSize)	// Would be 8K
 
-// Lobby Connection errors
-
-typedef enum
-{
-	ERROR_NOERROR,
-	ERROR_CONNECTION,
-	ERROR_FULL,
-	ERROR_CHEAT,
-	ERROR_KICKED,
-	ERROR_WRONGVESION,
-	ERROR_WRONGPASSWORD				// NOTE WRONG_PASSWORD results in conflict
-} LOBBY_ERROR_TYPES;
-
 // HACK(s) to allow us to call a src/multi*.c function
 extern void recvMultiStats(void);								// from src/multistat.c
 extern BOOL sendTextMessage(const char *pStr, BOOL all);		// from src/multiplay.c

lib/netplay/netplay.h

@@ -28,6 +28,20 @@
 
 #include "nettypes.h"
 
+// Lobby Connection errors
+
+typedef enum
+{
+	ERROR_NOERROR,
+	ERROR_CONNECTION,
+	ERROR_FULL,
+	ERROR_CHEAT,
+	ERROR_KICKED,
+	ERROR_WRONGVESION,
+	ERROR_WRONGPASSWORD				// NOTE WRONG_PASSWORD results in conflict
+} LOBBY_ERROR_TYPES;
+
+
 typedef enum
 {
 	NET_DROID,				//0 a new droid

src/keyedit.c

@@ -48,6 +48,7 @@
 #include "intdisplay.h"
 #include "lib/sound/audio_id.h"
 #include "lib/ivis_common/pieblitfunc.h"
+#include "lib/netplay/netplay.h"
 #include "multiint.h"
 
 // ////////////////////////////////////////////////////////////////////////////

src/multiint.c

@@ -170,7 +170,7 @@ static	void	addChatBox			(void);
 static	void	disableMultiButs	(void);
 static	void	processMultiopWidgets(UDWORD);
 static	void	SendFireUp			(void);
-//void	kickPlayer			(UDWORD dpid, const char *reason);
+
 void			runMultiOptions		(void);
 BOOL			startMultiOptions	(BOOL);
 void			frontendMultiMessages(void);

src/multiint.h

@@ -24,20 +24,6 @@
 #ifndef __INCLUDED_SRC_MULTIINT_H__
 #define __INCLUDED_SRC_MULTIINT_H__
 
-
-// Lobby Connection errors
-
-typedef enum
-{
-	ERROR_NOERROR,
-	ERROR_CONNECTION,
-	ERROR_FULL,
-	ERROR_CHEAT,
-	ERROR_KICKED,
-	ERROR_WRONGVESION,
-	ERROR_WRONGPASSWORD				// NOTE WRONG_PASSWORD results in conflict
-} LOBBY_ERROR_TYPES;
-
 extern LOBBY_ERROR_TYPES getLobbyError(void);
 extern void setLobbyError(LOBBY_ERROR_TYPES error_type);
 

src/power.c

@@ -31,7 +31,7 @@
 #include "lib/sound/audio.h"
 #include "objmem.h"
 #include "frontend.h"
-
+#include "lib/netplay/netplay.h"
 #include "multiplay.h"
 #include "multiint.h"