Made networking optional at compile time.

src/io/network.cpp

@@ -8,7 +8,7 @@
  * Part of the OpenJazz project
  *
  *
- * Copyright (c) 2005-2009 Alister Thomson
+ * Copyright (c) 2005-2010 Alister Thomson
  *
  * OpenJazz is distributed under the terms of
  * the GNU General Public License, version 2.0
@@ -19,70 +19,75 @@
  *
  */
 
+/*
+ * Deals with a platform-specific networking API.
+ *
+ * On most platforms, USE_SOCKETS should be defined.
+ *
+ */
+
 
 #include "controls.h"
 #include "gfx/font.h"
 #include "gfx/video.h"
 #include "network.h"
-#ifdef USE_SDL_NET
-#include <arpa/inet.h>
-#else
-#ifdef WIN32
+
+#ifdef USE_SOCKETS
+	#ifdef WIN32
 		#include <winsock.h>
 		#define ioctl ioctlsocket
 		#define socklen_t int
 		#define EWOULDBLOCK WSAEWOULDBLOCK
 		#define MSG_NOSIGNAL 0
-#else
+	#else
 		#include <sys/types.h>
 		#include <sys/socket.h>
 		#include <arpa/inet.h>
 		#include <sys/ioctl.h>
 		#include <unistd.h>
 		#include <errno.h>
+		#include <string.h>
+	#endif
+#elif defined USE_SDL_NET
+	#include <arpa/inet.h>
 #endif
-#endif
+
 
 Network::Network () {
-#ifdef USE_SDL_NET
-	SDLNet_Init();
-#else
-#ifdef WIN32
+
+#ifdef USE_SOCKETS
+	#ifdef WIN32
 	WSADATA WSAData;
 
 	// Start Windows Sockets
 	WSAStartup(MAKEWORD(1, 0), &WSAData);
+	#endif
+#elif defined USE_SDL_NET
+	SDLNet_Init();
 #endif
-#endif
+
 	return;
 
 }
 
 Network::~Network () {
-#ifdef USE_SDL_NET
-	SDLNet_Quit();
-#else
 
-#ifdef WIN32
+#ifdef USE_SOCKETS
+	#ifdef WIN32
 	// Shut down Windows Sockets
 	WSACleanup();
+	#endif
+#elif defined USE_SDL_NET
+	SDLNet_Quit();
 #endif
-#endif
+
 	return;
 
 }
 
 int Network::host () {
-#ifdef USE_SDL_NET
-	ipAddress.port = NET_PORT;
-	ipAddress.host = 0;	
-	socket = SDLNet_TCP_Open(&ipAddress);
 
-	if(socket == NULL)
-		return E_N_SOCKET;
-
-	return (int) socket;
-#else
+#ifdef USE_SOCKETS
 	sockaddr_in sockAddr;
 	int sock, nonblock;
 
@@ -119,24 +124,23 @@ int Network::host () {
 	}
 
 	return sock;
+#elif defined USE_SDL_NET
+	ipAddress.port = NET_PORT;
+	ipAddress.host = 0;	
+	socket = SDLNet_TCP_Open(&ipAddress);
+
+	if (socket == NULL) return E_N_SOCKET;
+
+	return (int)socket;
+#else
+	return E_N_OTHER;
 #endif
 
 }
 
 int Network::join (char *address) {
-#ifdef USE_SDL_NET
-	clearScreen(0);
-	fontmn2->showString("CONNECTING TO SERVER", screenW >> 2,
-			(screenH >> 1) - 16);
-	loop(NORMAL_LOOP);
-	ipAddress.port = NET_PORT;
-	ipAddress.host = inet_addr(address);	
-	socket = SDLNet_TCP_Open(&ipAddress);
-	if(socket == NULL)
-		return -1;
 
-	return (int) socket;
-#else
+#ifdef USE_SOCKETS
 	sockaddr_in sockAddr;
 	fd_set writefds; 
 	timeval timeouttv;
@@ -160,11 +164,11 @@ int Network::join (char *address) {
 	sockAddr.sin_family = AF_INET;
 	sockAddr.sin_port = htons(NET_PORT);
 
-#ifdef WIN32
+	#ifdef WIN32
 	sockAddr.sin_addr.s_addr = inet_addr(address);
-#else
+	#else
 	if (inet_aton(address, &(sockAddr.sin_addr)) == 0) return E_N_ADDRESS;
-#endif
+	#endif
 
 	// Initiate connection
 	con = connect(sock, (sockaddr *)&sockAddr, sizeof(sockAddr));
@@ -227,17 +231,27 @@ int Network::join (char *address) {
 	}
 
 	return sock;
+#elif defined USE_SDL_NET
+	clearScreen(0);
+	fontmn2->showString("CONNECTING TO SERVER", screenW >> 2,
+		(screenH >> 1) - 16);
+	loop(NORMAL_LOOP);
+	ipAddress.port = NET_PORT;
+	ipAddress.host = inet_addr(address);	
+	socket = SDLNet_TCP_Open(&ipAddress);
+
+	if (socket == NULL) return -1;
+
+	return (int)socket;
+#else
+	return E_N_OTHER;
 #endif
 
 }
 
 int Network::accept (int sock) {
-#ifdef USE_SDL_NET
-	clientSocket  = SDLNet_TCP_Accept((TCPsocket)sock);
-	if(clientSocket == NULL)
-		return -1;
-	return (int) &clientSocket;
-#else
+
+#ifdef USE_SOCKETS
 	sockaddr_in sockAddr;
 	int clientSocket, length;
 
@@ -254,45 +268,61 @@ int Network::accept (int sock) {
 	}
 
 	return clientSocket;
+#elif defined USE_SDL_NET
+	clientSocket = SDLNet_TCP_Accept((TCPsocket)sock);
+
+	if (clientSocket == NULL) return -1;
+
+	return (int)&clientSocket;
+#else
+	return -1;
 #endif
+
 }
 
 void Network::close (int sock) {
-#ifdef USE_SDL_NET
-	SDLNet_TCP_Close((TCPsocket)sock);
-#else
 
-#ifdef WIN32
+#ifdef USE_SOCKETS
+	#ifdef WIN32
 	closesocket(sock);
-#else
+	#else
 	::close(sock);
+	#endif
+#elif defined USE_SDL_NET
+	SDLNet_TCP_Close((TCPsocket)sock);
 #endif
-#endif
+
 	return;
 
 }
 
 int Network::send (int sock, unsigned char *buffer) {
-#ifdef USE_SDL_NET
+
+#ifdef USE_SOCKETS
+	return ::send(sock, (char *)buffer, buffer[0], MSG_NOSIGNAL);
+#elif defined USE_SDL_NET
 	return SDLNet_TCP_Send((TCPsocket)sock, (char *)buffer, buffer[0]);	
 #else
-	return ::send(sock, (char *)buffer, buffer[0], MSG_NOSIGNAL);
+	return 0;
 #endif
 
 }
 
 int Network::recv (int sock, unsigned char *buffer, int length) {
-#ifdef USE_SDL_NET
+
+#ifdef USE_SOCKETS
+	return ::recv(sock, (char *)buffer, length, MSG_NOSIGNAL);
+#elif defined USE_SDL_NET
 	return SDLNet_TCP_Recv((TCPsocket)sock, buffer, length);
 #else
-	return ::recv(sock, (char *)buffer, length, MSG_NOSIGNAL);
+	return 0;
 #endif
+
 }
 
 bool Network::isConnected (int sock) {
-#ifdef USE_SDL_NET
-	return SDLNet_SocketReady((TCPsocket) sock);
-#else
+
+#ifdef USE_SOCKETS
 	int length;
 	char buffer;
 
@@ -301,21 +331,29 @@ bool Network::isConnected (int sock) {
 
 	// Still connected if data was received or if there was no data to receive
 	return (length != -1) || (getError() == EWOULDBLOCK);
+#elif defined USE_SDL_NET
+	return SDLNet_SocketReady((TCPsocket)sock);
+#else
+	return false;
 #endif
+
 }
 
 
 int Network::getError () {
-#ifdef USE_SDL_NET
-	return (int) SDLNet_GetError();
-#else
 
-#ifdef WIN32
+#ifdef USE_SOCKETS
+	#ifdef WIN32
 	return WSAGetLastError();
-#else
+	#else
 	return errno;
+	#endif
+#elif defined USE_SDL_NET
+	return (int)SDLNet_GetError();
+#else
+	return 0;
 #endif
-#endif
+
 }
 
 

src/io/network.h

@@ -8,7 +8,7 @@
  * Part of the OpenJazz project
  *
  *
- * Copyright (c) 2005-2009 Alister Thomson
+ * Copyright (c) 2005-2010 Alister Thomson
  *
  * OpenJazz is distributed under the terms of
  * the GNU General Public License, version 2.0
@@ -24,6 +24,7 @@
 
 
 #include "OpenJazz.h"
+
 #ifdef USE_SDL_NET
 #include <SDL_net.h>
 #endif
@@ -46,6 +47,13 @@
 class Network {
 
 	public:
+#ifdef USE_SDL_NET
+		TCPsocket socket;
+		TCPsocket clientSocket;
+		IPaddress ipAddress;
+		SDLNet_SocketSet socketset;
+#endif
+
 		Network          ();
 		~Network         ();
 
@@ -57,12 +65,6 @@ class Network {
 		int  recv        (int sock, unsigned char *buffer, int length);
 		bool isConnected (int sock);
 		int  getError    ();
-#ifdef USE_SDL_NET
-		TCPsocket socket;
-		TCPsocket clientSocket;
-		IPaddress ipAddress;
-		SDLNet_SocketSet socketset;
-#endif
 
 };
 

src/main.cpp

@@ -63,18 +63,20 @@ int loadMain (int argc, char *argv[]) {
 
 	// Determine paths
 
-	// Use the hard-coded path, if available
+	// Use hard-coded paths, if available
 
 #ifdef DATAPATH
 	firstPath = new Path(NULL, createString(DATAPATH));
-#elseifdef __SYMBIAN32__
+#else
+	firstPath = NULL;
+#endif
+
+#ifdef __SYMBIAN32__
 	#ifdef UIQ3
-		firstPath = new Path(NULL, createString("c:\\shared\\openjazz\\"));
+		firstPath = new Path(firstPath, createString("c:\\shared\\openjazz\\"));
 	#else
-		firstPath = new Path(NULL, createString("c:\\data\\openjazz\\"));
+		firstPath = new Path(firstPath, createString("c:\\data\\openjazz\\"));
 	#endif
-#else
-	firstPath = NULL;
 #endif
 
 

src/menu/mainmenu.cpp

@@ -40,13 +40,15 @@
 
 int Menu::main () {
 
+#if (defined USE_SOCKETS) || (defined USE_SDL_NET)
 	const char *newGameOptions[6] = {"new single player game", "new co-op game",
 		"new battle", "new team battle", "new race", "join game"};
+	int ret;
+#endif
 	Scene *scene;
 	SDL_Rect src, dst;
 	int option, suboption;
 	unsigned int idleTime;
-	int ret;
 
 	option = suboption = 0;
 
@@ -73,6 +75,7 @@ int Menu::main () {
 
 				case 0: // New game
 
+#if (defined USE_SOCKETS) || (defined USE_SDL_NET)
 					while (true) {
 
 						ret = generic(newGameOptions, 6, &suboption);
@@ -92,6 +95,9 @@ int Menu::main () {
 						}
 
 					}
+#else
+					if (newGameEpisode(suboption) == E_QUIT) return E_QUIT;
+#endif
 
 					break;