gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-21 06:34:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tron 2005-07-25 16:33:58 +00:00
parent f60b122a68
commit 84f78ea44a
5 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dedicated.c
View File

@ -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 <sys/types.h>
#include <unistd.h>
#endif
#ifdef UNIX
# include <sys/types.h>
# include <unistd.h>
#endif
#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 */

2
os2.c
View File

@ -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}
};

2
unix.c
View File

@ -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}
};

23
video/dedicated_v.c
View File

@ -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 <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_driver = {
DedicatedVideoChangeRes,
DedicatedVideoFullScreen,
};
#endif /* ENABLE_NETWORK */

2
win32.c
View File

@ -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 }
};