diff --git a/dedicated.c b/dedicated.c --- a/dedicated.c +++ b/dedicated.c @@ -1,32 +1,17 @@ /* $Id$ */ #include "stdafx.h" -#include "openttd.h" #ifdef ENABLE_NETWORK +#if defined(UNIX) && !defined(__MORPHOS__) + +#include "openttd.h" #include "variables.h" -#ifdef __OS2__ -# include -# include -#endif - -#ifdef UNIX -# include -# include -#endif +#include +#include -#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 */ diff --git a/os2.c b/os2.c --- a/os2.c +++ b/os2.c @@ -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} }; diff --git a/unix.c b/unix.c --- a/unix.c +++ b/unix.c @@ -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} }; diff --git a/video/dedicated_v.c b/video/dedicated_v.c --- a/video/dedicated_v.c +++ b/video/dedicated_v.c @@ -1,11 +1,10 @@ /* $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 /* 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 */ diff --git a/win32.c b/win32.c --- a/win32.c +++ b/win32.c @@ -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 } };