Dateien des Clients neu angeordnet

Makefile

@@ -89,6 +89,13 @@ all: client
 client:
 	@-mkdir -p build \
 		build/client \
+		build/client/console \
+		build/client/input \
+		build/client/menu \
+		build/client/sound \
+		build/common \
+		build/game \
+		build/posix \
 		build/server
 	$(MAKE) build/client/quake2	
 
@@ -111,40 +118,40 @@ QUAKE2_OBJS = \
 	build/client/cl_scrn.o \
 	build/client/cl_view.o \
 	build/client/cl_newfx.o \
-	build/client/console.o \
+	build/client/console/console.o \
-	build/client/keys.o \
+	build/client/input/keys.o \
-	build/client/menu.o \
+	build/client/menu/menu.o \
-	build/client/qmenu.o \
+	build/client/menu/qmenu.o \
-	build/client/snd_dma.o \
+	build/client/sound/snd_dma.o \
-	build/client/snd_mem.o \
+	build/client/sound/snd_mem.o \
-	build/client/snd_mix.o \
+	build/client/sound/snd_mix.o \
-	build/client/cmd.o \
+	build/common/cmd.o \
-	build/client/cmodel.o \
+	build/common/cmodel.o \
-	build/client/common.o \
+	build/common/common.o \
-	build/client/crc.o \
+	build/common/crc.o \
-	build/client/cvar.o \
+	build/common/cvar.o \
-	build/client/files.o \
+	build/common/files.o \
-	build/client/md4.o \
+	build/common/md4.o \
-	build/client/net_chan.o \
+	build/common/net_chan.o \
-	build/client/pmove.o \
+	build/common/pmove.o \
-	build/client/m_flash.o \
+	build/game/m_flash.o \
-	build/client/q_shared.o \
+	build/game/q_shared.o \
-	build/client/sv_ccmds.o \
+	build/server/sv_ccmds.o \
-	build/client/sv_ents.o \
+	build/server/sv_ents.o \
-	build/client/sv_game.o \
+	build/server/sv_game.o \
-	build/client/sv_init.o \
+	build/server/sv_init.o \
-	build/client/sv_main.o \
+	build/server/sv_main.o \
-	build/client/sv_send.o \
+	build/server/sv_send.o \
-	build/client/sv_user.o \
+	build/server/sv_user.o \
-	build/client/sv_world.o \
+	build/server/sv_world.o \
-	build/client/cd_sdl.o \
+	build/posix/cd_sdl.o \
-	build/client/glob.o \
+	build/posix/glob.o \
-	build/client/net_udp.o \
+	build/posix/net_udp.o \
-	build/client/q_shlinux.o \
+	build/posix/q_shlinux.o \
-	build/client/snd_sdl.o \
+	build/posix/snd_sdl.o \
-	build/client/sys_linux.o \
+	build/posix/sys_linux.o \
-	build/client/vid_menu.o \
+	build/posix/vid_menu.o \
-	build/client/vid_so.o 
+	build/posix/vid_so.o 
 
 build/client/quake2 : $(QUAKE2_OBJS)
 	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(LDFLAGS) $(SDLLDFLAGS)
@@ -185,105 +192,105 @@ build/client/cl_view.o :    src/client/cl_view.c
 build/client/cl_newfx.o :   src/client/cl_newfx.c
 	$(CC) $(CFLAGS) -o $@ -c $<  
 
-build/client/console.o :    src/client/console.c
+build/client/console/console.o :    src/client/console/console.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/keys.o :       src/client/keys.c
+build/client/input/keys.o :       src/client/input/keys.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/menu.o :       src/client/menu.c
+build/client/menu/menu.o :       src/client/menu/menu.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/qmenu.o :      src/client/qmenu.c
+build/client/menu/qmenu.o :      src/client/menu/qmenu.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/snd_dma.o :    src/client/snd_dma.c
+build/client/sound/snd_dma.o :    src/client/sound/snd_dma.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/snd_mem.o :    src/client/snd_mem.c
+build/client/sound/snd_mem.o :    src/client/sound/snd_mem.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/snd_mix.o :    src/client/snd_mix.c
+build/client/sound/snd_mix.o :    src/client/sound/snd_mix.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/cmd.o :        src/common/cmd.c
+build/common/cmd.o :        src/common/cmd.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/cmodel.o :     src/common/cmodel.c
+build/common/cmodel.o :     src/common/cmodel.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/common.o :     src/common/common.c
+build/common/common.o :     src/common/common.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/crc.o :        src/common/crc.c
+build/common/crc.o :        src/common/crc.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/cvar.o :       src/common/cvar.c
+build/common/cvar.o :       src/common/cvar.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/files.o :      src/common/files.c
+build/common/files.o :      src/common/files.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/md4.o :        src/common/md4.c
+build/common/md4.o :        src/common/md4.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/net_chan.o :   src/common/net_chan.c
+build/common/net_chan.o :   src/common/net_chan.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/pmove.o :      src/common/pmove.c
+build/common/pmove.o :      src/common/pmove.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
  
-build/client/m_flash.o :    src/game/quake2/m_flash.c
+build/game/m_flash.o :    src/game/quake2/m_flash.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
  
-build/client/q_shared.o :   src/game/quake2/q_shared.c
+build/game/q_shared.o :   src/game/quake2/q_shared.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_ccmds.o :   src/server/sv_ccmds.c
+build/server/sv_ccmds.o :   src/server/sv_ccmds.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_ents.o :    src/server/sv_ents.c
+build/server/sv_ents.o :    src/server/sv_ents.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_game.o :    src/server/sv_game.c
+build/server/sv_game.o :    src/server/sv_game.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_init.o :    src/server/sv_init.c
+build/server/sv_init.o :    src/server/sv_init.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_main.o :    src/server/sv_main.c
+build/server/sv_main.o :    src/server/sv_main.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_send.o :    src/server/sv_send.c
+build/server/sv_send.o :    src/server/sv_send.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_user.o :    src/server/sv_user.c
+build/server/sv_user.o :    src/server/sv_user.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/sv_world.o :   src/server/sv_world.c
+build/server/sv_world.o :   src/server/sv_world.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
  
-build/client/cd_sdl.o :     src/platforms/posix/cd_sdl.c
+build/posix/cd_sdl.o :     src/platforms/posix/cd_sdl.c
 	$(CC) $(CFLAGS) -o $@ -c $< $(SDLCFLAGS)
  
-build/client/glob.o :       src/platforms/posix/glob.c
+build/posix/glob.o :       src/platforms/posix/glob.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/net_udp.o :   src/platforms/posix/net_udp.c
+build/posix/net_udp.o :   src/platforms/posix/net_udp.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
  
-build/client/q_shlinux.o :  src/platforms/posix/q_shlinux.c
+build/posix/q_shlinux.o :  src/platforms/posix/q_shlinux.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/snd_sdl.o :    src/platforms/posix/snd_sdl.c
+build/posix/snd_sdl.o :    src/platforms/posix/snd_sdl.c
 	$(CC) $(CFLAGS) -o $@ -c $< $(SDLCFLAGS)
  
-build/client/sys_linux.o :  src/platforms/posix/sys_linux.c
+build/posix/sys_linux.o :  src/platforms/posix/sys_linux.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
  
-build/client/vid_menu.o :   src/platforms/posix/vid_menu.c
+build/posix/vid_menu.o :   src/platforms/posix/vid_menu.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 
-build/client/vid_so.o :     src/platforms/posix/vid_so.c
+build/posix/vid_so.o :     src/platforms/posix/vid_so.c
 	$(CC) $(CFLAGS) -o $@ -c $< 
 

src/client/cl_cin.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "client.h"
+#include "header/client.h"
 
 typedef struct
 {

src/client/cl_ents.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_ents.c -- entity parsing and management
 
-#include "client.h"
+#include "header/client.h"
 
 
 extern	struct model_s	*cl_mod_powerscreen;

src/client/cl_fx.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_fx.c -- entity effects parsing and management
 
-#include "client.h"
+#include "header/client.h"
 
 void CL_LogoutEffect (vec3_t org, int type);
 void CL_ItemRespawnParticles (vec3_t org);

src/client/cl_input.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl.input.c  -- builds an intended movement command to send to the server
 
-#include "client.h"
+#include "header/client.h"
 
 cvar_t	*cl_nodelta;
 

src/client/cl_inv.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_inv.c -- client inventory screen
 
-#include "client.h"
+#include "header/client.h"
 
 /*
 ================

src/client/cl_main.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // cl_main.c  -- client main loop
 
-#include "client.h"
+#include "header/client.h"
 
 cvar_t	*freelook;
 

src/client/cl_newfx.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_newfx.c -- MORE entity effects parsing and management
 
-#include "client.h"
+#include "header/client.h"
 
 extern cparticle_t	*active_particles, *free_particles;
 extern cparticle_t	particles[MAX_PARTICLES];

src/client/cl_parse.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_parse.c  -- parse a message received from the server
 
-#include "client.h"
+#include "header/client.h"
 
 char *svc_strings[256] =
 {

src/client/cl_pred.c

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "client.h"
+#include "header/client.h"
 
 
 /*

src/client/cl_scrn.c

@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
   */
 
-#include "client.h"
+#include "header/client.h"
 
 float		scr_con_current;	// aproaches scr_conlines at scr_conspeed
 float		scr_conlines;		// 0.0 to 1.0 lines of console to display

src/client/cl_tent.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_tent.c -- client side temporary entities
 
-#include "client.h"
+#include "header/client.h"
 
 typedef enum
 {

src/client/cl_view.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_view.c -- player rendering positioning
 
-#include "client.h"
+#include "header/client.h"
 
 //=============
 //

src/client/console/console.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // console.c
 
-#include "client.h"
+#include "../header/client.h"
 #include <time.h>
 
 console_t	con;

src/client/header/client.h

@@ -35,14 +35,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <ctype.h>
 
 #include "ref.h"
-
 #include "vid.h"
 #include "screen.h"
-#include "sound.h"
+
-#include "input.h"
+#include "../sound/sound.h"
-#include "keys.h"
+#include "../input/input.h"
-#include "console.h"
+#include "../input/keys.h"
-#include "cdaudio.h"
+#include "../console/console.h"
+#include "../sound/cdaudio.h"
 
 //=============================================================================
 

src/client/header/ref.h

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef __REF_H
 #define __REF_H
 
-#include "../common/qcommon.h"
+#include "../../common/qcommon.h"
 
 #define	MAX_DLIGHTS		32
 #define	MAX_ENTITIES	128

src/client/input/keys.c

@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
-#include "client.h"
+#include "../header/client.h"
 
 /*
 

src/client/menu/menu.c

@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifdef _WIN32
 #include <io.h>
 #endif
-#include "client.h"
+#include "../header/client.h"
-#include "../client/qmenu.h"
+#include "qmenu.h"
 
 static int	m_main_cursor;
 

src/client/menu/qmenu.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <string.h>
 #include <ctype.h>
 
-#include "client.h"
+#include "../header/client.h"
 #include "qmenu.h"
 
 static void	 Action_DoEnter( menuaction_s *a );

src/client/sound/snd_dma.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_dma.c -- main control for any streaming sound output device
 
-#include "client.h"
+#include "../header/client.h"
 #include "snd_loc.h"
 
 void S_Play(void);

src/client/sound/snd_mem.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_mem.c: sound caching
 
-#include "client.h"
+#include "../header/client.h"
 #include "snd_loc.h"
 
 int			cache_full_cycle;

src/client/sound/snd_mix.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_mix.c -- portable code to mix sounds for snd_dma.c
 
-#include "client.h"
+#include "../header/client.h"
 #include "snd_loc.h"
 
 #define	PAINTBUFFER_SIZE	8192

src/platforms/posix/cd_sdl.c

@@ -28,7 +28,7 @@
 
 #include <stdio.h>
 #include "SDL.h"
-#include "../../client/client.h"
+#include "../../client/header/client.h"
 
 static qboolean cdValid = false;
 static qboolean initialized = false;

src/platforms/posix/snd_sdl.c

@@ -27,8 +27,8 @@
 
 #include "SDL.h"
 
-#include "../../client/client.h"
+#include "../../client/header/client.h"
-#include "../../client/snd_loc.h"
+#include "../../client/sound/snd_loc.h"
 
 static int  snd_inited;
 static dma_t *shm;

src/platforms/posix/vid_menu.c

@@ -1,5 +1,5 @@
-#include "../../client/client.h"
+#include "../../client/header/client.h"
-#include "../../client/qmenu.h"
+#include "../../client/menu/qmenu.h"
 
 /*
 ====================================================================

src/platforms/posix/vid_so.c

@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 #include <errno.h>
 
-#include "../../client/client.h"
+#include "../../client/header/client.h"
 
 #include "rw_linux.h"