From 84f78ea44a90763e9a35776024f214f3c68dd6fe Mon Sep 17 00:00:00 2001 From: tron Date: Mon, 25 Jul 2005 16:33:58 +0000 Subject: (svn r2710) Simplify dedicated server code a bit and don't compile it at all, if network support ist disabled --- video/dedicated_v.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'video') diff --git a/video/dedicated_v.c b/video/dedicated_v.c index 5396ad348..e0408c9bf 100644 --- 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_driver = { DedicatedVideoChangeRes, DedicatedVideoFullScreen, }; + +#endif /* ENABLE_NETWORK */ -- cgit v1.2.3-54-g00ecf