yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dedicated-Client Trennung ist nun bis auf den

Browse source 
plattformabhängigen Teil beendet
This commit is contained in:
Yamagi Burmeister 2009-03-04 15:24:29 +00:00
parent c2bb9ccc32
commit 7e1778b106
4 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Makefile
View file

@ -219,14 +219,10 @@ DEDICATED_SERVER_COMMON_OBJS = \
# Dedicated server POSIX platform objects
DEDICATED_SERVER_POSIX_OBJS = \
build/dedicated_server_posix/cd_sdl.o \
build/dedicated_server_posix/glob.o \
build/dedicated_server_posix/net_udp.o \
build/dedicated_server_posix/q_shlinux.o \
build/dedicated_server_posix/snd_sdl.o \
build/dedicated_server_posix/sys_linux.o \
build/dedicated_server_posix/vid_menu.o \
build/dedicated_server_posix/vid_so.o
build/dedicated_server_posix/sys_linux.o
# ----------
@ -410,7 +406,7 @@ build/dedicated_server/sv_world.o : src/server/sv_world.c
# ---------
# Dedicated server dedicated_server_common build
# Dedicated server common build
build/dedicated_server_common/cmd.o : src/common/cmd.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
@ -440,10 +436,7 @@ build/dedicated_server_common/pmove.o : src/common/pmove.c
# ----------
# POSIX build
build/dedicated_server_posix/cd_sdl.o : src/platforms/posix/cd_sdl.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $< $(SDLCFLAGS)
# Dedicated server POSIX build
build/dedicated_server_posix/glob.o : src/platforms/posix/glob.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
@ -453,17 +446,8 @@ build/dedicated_server_posix/net_udp.o : src/platforms/posix/net_udp.c
build/dedicated_server_posix/q_shlinux.o : src/platforms/posix/q_shlinux.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_posix/snd_sdl.o : src/platforms/posix/snd_sdl.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $< $(SDLCFLAGS)
build/dedicated_server_posix/sys_linux.o : src/platforms/posix/sys_linux.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_posix/vid_menu.o : src/platforms/posix/vid_menu.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
build/dedicated_server_posix/vid_so.o : src/platforms/posix/vid_so.c
$(CC) $(CFLAGS_DEDICATED_SERVER) -o $@ -c $<
# ----------

6
src/common/common.c
View file

@ -1344,8 +1344,10 @@ float crand(void)
return (rand()&32767)* (2.0/32767) - 1;
}
#ifndef DEDICATED_ONLY
void Key_Init (void);
void SCR_EndLoadingPlaque (void);
#endif
/*
=============
@ -1385,7 +1387,9 @@ void Qcommon_Init (int argc, char **argv)
Cmd_Init ();
Cvar_Init ();
#ifndef DEDICATED_ONLY
Key_Init ();
#endif
// we need to add the early commands twice, because
// a basedir or cddir needs to be set before execing
@ -1437,7 +1441,7 @@ void Qcommon_Init (int argc, char **argv)
Netchan_Init ();
SV_Init ();
#ifdef DEDICATED_ONLY
#ifndef DEDICATED_ONLY
CL_Init ();
#endif

2
src/common/files.c
View file

@ -301,7 +301,9 @@ void FS_Read (void *buffer, int len, FILE *f)
if (!tries)
{
tries = 1;
#ifndef DEDICATED_ONLY
CDAudio_Stop();
#endif
}
else
Com_Error (ERR_FATAL, "FS_Read: 0 bytes read");

5
src/server/sv_game.c
View file

@ -319,7 +319,9 @@ SV_InitGameProgs
Init the game subsystem for a new map
===============
*/
#ifndef DEDICATED_ONLY
void SCR_DebugGraph (float value, int color);
#endif
void SV_InitGameProgs (void)
{
@ -380,7 +382,10 @@ void SV_InitGameProgs (void)
import.args = Cmd_Args;
import.AddCommandString = Cbuf_AddText;
#ifndef DEDICATED_ONLY
import.DebugGraph = SCR_DebugGraph;
#endif
import.SetAreaPortalState = CM_SetAreaPortalState;
import.AreasConnected = CM_AreasConnected;