cpp/openttd-patchpack/source Changeset - r2195:f40560511b07

Changeset - r2195:f40560511b07

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

tron - 19 years ago 2005-07-25 16:33:58
tron@openttd.org

(svn r2710) Simplify dedicated server code a bit and don't compile it at all, if network support ist disabled

5 files changed with 15 insertions and 39 deletions:

dedicated.c

os2.c

unix.c

video/dedicated_v.c

win32.c

0 comments (0 inline, 0 general)

dedicated.c

➞

Show inline comments

 /* $Id$ */
 #include "stdafx.h"
 #include "openttd.h"
 #ifdef ENABLE_NETWORK
 #if defined(UNIX) && !defined(__MORPHOS__)
 #include "openttd.h"
 #include "variables.h"
 #ifdef __OS2__
 #	include <sys/types.h>
 #	include <unistd.h>
 #endif
 #ifdef UNIX
 #	include <sys/types.h>
 #	include <unistd.h>
 #endif
 #include <sys/types.h>
 #include <unistd.h>
 #ifdef __MORPHOS__
 /* Voids the fork, option will be disabled for MorphOS build anyway, because
  * MorphOS doesn't support forking (could only implemented with lots of code
  * changes here). */
 int fork(void) { return -1; }
 int dup2(int oldd, int newd) { return -1; }
 #endif
 #ifdef UNIX
 /* We want to fork our dedicated server */
 void DedicatedFork(void)
+{
 	/* Fork the program */

os2.c

➞

Show inline comments

@@ @@ -437,7 +437,9 @@ const DriverDesc _video_driver_descs[] = @@
 #if defined(WITH_SDL)
 	{	"sdl",			"SDL Video Driver",			&_sdl_video_driver,			1},
 #endif
 #ifdef ENABLE_NETWORK
 	{	"dedicated",	"Dedicated Video Driver",	&_dedicated_video_driver,	0},
 #endif
 	{	NULL,			NULL,						NULL,						0}
 };

unix.c

➞

Show inline comments

@@ @@ -378,7 +378,9 @@ const DriverDesc _video_driver_descs[] = @@
 #if defined(WITH_SDL)
 	{ "sdl",	"SDL Video Driver",		&_sdl_video_driver,		1},
 #endif
 #ifdef ENABLE_NETWORK
 	{ "dedicated", "Dedicated Video Driver", &_dedicated_video_driver, 0},
 #endif
 	{ NULL,		NULL,									NULL,									0}
 };

video/dedicated_v.c

➞

Show inline comments

 /* $Id$ */
 #include "../stdafx.h"
 #include "../openttd.h"
 #include "dedicated_v.h"
 #ifdef ENABLE_NETWORK
 #include "../openttd.h"
 #include "../debug.h"
 #include "../functions.h"
 #include "../gfx.h"
@@ @@ -14,6 +13,7 @@ @@
 #include "../command.h"
 #include "../console.h"
 #include "../variables.h"
 #include "dedicated_v.h"
 #ifdef __OS2__
 #	include <sys/time.h> /* gettimeofday */
@@ @@ -281,23 +281,6 @@ static int DedicatedVideoMainLoop(void) @@
+	}
+}
 #else
 static const char *DedicatedVideoStart(const char * const *parm)
+{
 	DEBUG(misc, 0) ("OpenTTD compiled without network support, exiting.");
 	return NULL;
+}
 static void DedicatedVideoStop(void) {}
 static void DedicatedVideoMakeDirty(int left, int top, int width, int height) {}
 static bool DedicatedVideoChangeRes(int w, int h) { return false; }
 static void DedicatedVideoFullScreen(bool fs) {}
 static int DedicatedVideoMainLoop(void) { return ML_QUIT; }
 #endif /* ENABLE_NETWORK */
 const HalVideoDriver _dedicated_video_driver = {
 	DedicatedVideoStart,
 	DedicatedVideoStop,
@@ @@ -306,3 +289,5 @@ const HalVideoDriver _dedicated_video_dr @@
 	DedicatedVideoChangeRes,
 	DedicatedVideoFullScreen,
 };
 #endif /* ENABLE_NETWORK */

win32.c

➞

Show inline comments

@@ @@ -942,7 +942,9 @@ const DriverDesc _video_driver_descs[] = @@
 	{"sdl", "SDL Video Driver",					&_sdl_video_driver,			1},
 #endif
 	{"win32", "Win32 GDI Video Driver",	&_win32_video_driver,		Windows_NT3_51},
 #ifdef ENABLE_NETWORK
 	{ "dedicated", "Dedicated Video Driver", &_dedicated_video_driver, 0},
 #endif
 	{ NULL, NULL, NULL, 0 }
 };

0 comments (0 inline, 0 general)