summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bsp.c2
-rw-r--r--src/cl_local.h2
-rw-r--r--src/cl_null.c2
-rw-r--r--src/cmd.c2
-rw-r--r--src/cmodel.c2
-rw-r--r--src/common.c6
-rw-r--r--src/common.h (renamed from src/com_local.h)0
-rw-r--r--src/crc.c2
-rw-r--r--src/cvar.c2
-rw-r--r--src/files.c2
-rw-r--r--src/gl_local.h2
-rw-r--r--src/in_evdev.c2
-rw-r--r--src/in_lirc.c2
-rw-r--r--src/io_sleep.c2
-rw-r--r--src/mdfour.c2
-rw-r--r--src/net_chan.c2
-rw-r--r--src/net_common.c2
-rw-r--r--src/pmove.c3
-rw-r--r--src/prompt.c2
-rw-r--r--src/q_field.c2
-rw-r--r--src/q_msg.c2
-rw-r--r--src/qal_api.c2
-rw-r--r--src/qgl_api.c3
-rw-r--r--src/r_images.c2
-rw-r--r--src/r_models.c2
-rw-r--r--src/snd_oss.c2
-rw-r--r--src/snd_sdl.c2
-rw-r--r--src/sv_local.h2
-rw-r--r--src/sw_local.h2
-rw-r--r--src/sys_unix.c2
-rw-r--r--src/ui_local.h2
-rw-r--r--src/vid_sdl.c2
-rw-r--r--src/win_local.h2
33 files changed, 37 insertions, 33 deletions
diff --git a/src/bsp.c b/src/bsp.c
index 3eebe27..e6e6980 100644
--- a/src/bsp.c
+++ b/src/bsp.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// bsp.c -- model loading
-#include "com_local.h"
+#include "common.h"
#include "q_list.h"
#include "files.h"
#include "sys_public.h"
diff --git a/src/cl_local.h b/src/cl_local.h
index e73971b..ef176eb 100644
--- a/src/cl_local.h
+++ b/src/cl_local.h
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// client.h -- primary header for client
-#include "com_local.h"
+#include "common.h"
#include "q_list.h"
#include "files.h"
#include "sys_public.h"
diff --git a/src/cl_null.c b/src/cl_null.c
index 8a0c3b9..30aebbf 100644
--- a/src/cl_null.c
+++ b/src/cl_null.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// cl_null.c -- this file can stub out the entire client system
// for pure dedicated servers
-#include "com_local.h"
+#include "common.h"
#include "files.h"
qboolean CL_CheatsOK( void ) {
diff --git a/src/cmd.c b/src/cmd.c
index 2ee5f37..b4eb50e 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// cmd.c -- Quake script command processing module
-#include "com_local.h"
+#include "common.h"
#include "files.h"
#include "q_list.h"
#if USE_CLIENT
diff --git a/src/cmodel.c b/src/cmodel.c
index 7d14352..9b026a6 100644
--- a/src/cmodel.c
+++ b/src/cmodel.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// cmodel.c -- model loading
-#include "com_local.h"
+#include "common.h"
#include "q_list.h"
#include "sys_public.h"
#include "bsp.h"
diff --git a/src/common.c b/src/common.c
index a38e804..28b007b 100644
--- a/src/common.c
+++ b/src/common.c
@@ -17,8 +17,12 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
+//
// common.c -- misc functions used in client and server
-#include "com_local.h"
+//
+
+#include "common.h"
#include "files.h"
#include "protocol.h"
#include "q_msg.h"
diff --git a/src/com_local.h b/src/common.h
index f4d03d3..f4d03d3 100644
--- a/src/com_local.h
+++ b/src/common.h
diff --git a/src/crc.c b/src/crc.c
index 02b16fb..9dfbc9b 100644
--- a/src/crc.c
+++ b/src/crc.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* crc.c */
-#include "com_local.h"
+#include "common.h"
// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
// and the initial and final xor values shown below... in other words, the
diff --git a/src/cvar.c b/src/cvar.c
index 9064ad0..b31b6e8 100644
--- a/src/cvar.c
+++ b/src/cvar.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// cvar.c -- dynamic variable tracking
-#include "com_local.h"
+#include "common.h"
#include "cl_public.h"
#include "files.h"
diff --git a/src/files.c b/src/files.c
index 8f4b52d..a4aeff9 100644
--- a/src/files.c
+++ b/src/files.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "files.h"
#include "sys_public.h"
#include "cl_public.h"
diff --git a/src/gl_local.h b/src/gl_local.h
index d6fccd5..1b1041f 100644
--- a/src/gl_local.h
+++ b/src/gl_local.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "files.h"
#include "ref_public.h"
#include "in_public.h"
diff --git a/src/in_evdev.c b/src/in_evdev.c
index 4533dc3..b563a25 100644
--- a/src/in_evdev.c
+++ b/src/in_evdev.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "key_public.h"
#include "in_public.h"
#include "cl_public.h"
diff --git a/src/in_lirc.c b/src/in_lirc.c
index 4b84239..0af53e5 100644
--- a/src/in_lirc.c
+++ b/src/in_lirc.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "key_public.h"
#include "in_public.h"
#include "cl_public.h"
diff --git a/src/io_sleep.c b/src/io_sleep.c
index 26aad82..5edd1c7 100644
--- a/src/io_sleep.c
+++ b/src/io_sleep.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "sys_public.h"
#include "io_sleep.h"
#ifdef _WIN32
diff --git a/src/mdfour.c b/src/mdfour.c
index a4bc2e0..9706dbb 100644
--- a/src/mdfour.c
+++ b/src/mdfour.c
@@ -25,7 +25,7 @@
Boston, MA 02111-1307, USA
*/
-#include "com_local.h"
+#include "common.h"
#include "mdfour.h"
#if SIZEOF_INT > 4
diff --git a/src/net_chan.c b/src/net_chan.c
index 023da21..6ac2c9e 100644
--- a/src/net_chan.c
+++ b/src/net_chan.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "protocol.h"
#include "q_msg.h"
#include "net_sock.h"
diff --git a/src/net_common.c b/src/net_common.c
index afcd8af..5b0c1de 100644
--- a/src/net_common.c
+++ b/src/net_common.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// net.c
//
-#include "com_local.h"
+#include "common.h"
#include "protocol.h"
#include "q_msg.h"
#include "q_fifo.h"
diff --git a/src/pmove.c b/src/pmove.c
index 0bcd6d3..2f2b8c9 100644
--- a/src/pmove.c
+++ b/src/pmove.c
@@ -18,7 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include <config.h>
+#include "q_shared.h"
#include "pmove.h"
#define STEPSIZE 18
diff --git a/src/prompt.c b/src/prompt.c
index f106bf4..a389074 100644
--- a/src/prompt.c
+++ b/src/prompt.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// prompt.c
//
-#include "com_local.h"
+#include "common.h"
#include "files.h"
#include "q_field.h"
#include "prompt.h"
diff --git a/src/q_field.c b/src/q_field.c
index f1e3361..1f817df 100644
--- a/src/q_field.c
+++ b/src/q_field.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// field.c
//
-#include "com_local.h"
+#include "common.h"
#include "cl_public.h"
#include "key_public.h"
#include "ref_public.h"
diff --git a/src/q_msg.c b/src/q_msg.c
index 70f83a5..02cbb61 100644
--- a/src/q_msg.c
+++ b/src/q_msg.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "protocol.h"
#include "q_msg.h"
diff --git a/src/qal_api.c b/src/qal_api.c
index eb62ea4..7422ca6 100644
--- a/src/qal_api.c
+++ b/src/qal_api.c
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "sys_public.h"
#include "qal_api.h"
#include <AL/alc.h>
diff --git a/src/qgl_api.c b/src/qgl_api.c
index 7da187b..e9503f3 100644
--- a/src/qgl_api.c
+++ b/src/qgl_api.c
@@ -28,8 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
** QGL_Shutdown() - unloads libraries, NULLs function pointers
*/
-#include "com_local.h"
-#include "in_public.h"
+#include "common.h"
#include "vid_public.h"
#include "qgl_local.h"
#include "qgl_api.h"
diff --git a/src/r_images.c b/src/r_images.c
index 139fde7..a847b0d 100644
--- a/src/r_images.c
+++ b/src/r_images.c
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// images.c -- image reading and writing functions
//
-#include "com_local.h"
+#include "common.h"
#include "d_pcx.h"
#include "d_wal.h"
diff --git a/src/r_models.c b/src/r_models.c
index 83a8083..a3b85c1 100644
--- a/src/r_models.c
+++ b/src/r_models.c
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "files.h"
#include "sys_public.h"
#include "q_list.h"
diff --git a/src/snd_oss.c b/src/snd_oss.c
index 6260530..d62030f 100644
--- a/src/snd_oss.c
+++ b/src/snd_oss.c
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#include <stdio.h>
-#include "com_local.h"
+#include "common.h"
#include "snd_local.h"
static int audio_fd;
diff --git a/src/snd_sdl.c b/src/snd_sdl.c
index c83fd23..7122856 100644
--- a/src/snd_sdl.c
+++ b/src/snd_sdl.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// snd_sdl.c
//
-#include "com_local.h"
+#include "common.h"
#include "snd_local.h"
#include <SDL.h>
diff --git a/src/sv_local.h b/src/sv_local.h
index c30f96c..9289d4f 100644
--- a/src/sv_local.h
+++ b/src/sv_local.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//define PARANOID // speed sapping error checking
-#include "com_local.h"
+#include "common.h"
#include "q_list.h"
#include "files.h"
#include "sys_public.h"
diff --git a/src/sw_local.h b/src/sw_local.h
index 14bcb76..2478467 100644
--- a/src/sw_local.h
+++ b/src/sw_local.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "files.h"
#include "ref_public.h"
#include "in_public.h"
diff --git a/src/sys_unix.c b/src/sys_unix.c
index 99354b2..f38be84 100644
--- a/src/sys_unix.c
+++ b/src/sys_unix.c
@@ -43,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <machine/param.h>
#endif
-#include "com_local.h"
+#include "common.h"
#include "q_list.h"
#include "q_field.h"
#include "prompt.h"
diff --git a/src/ui_local.h b/src/ui_local.h
index 87245c4..be3814d 100644
--- a/src/ui_local.h
+++ b/src/ui_local.h
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "com_local.h"
+#include "common.h"
#include "q_list.h"
#include "q_field.h"
#include "ref_public.h"
diff --git a/src/vid_sdl.c b/src/vid_sdl.c
index 22bfba1..ece3b11 100644
--- a/src/vid_sdl.c
+++ b/src/vid_sdl.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// vid_sdl.c
//
-#include "com_local.h"
+#include "common.h"
#include "in_public.h"
#include "vid_public.h"
#include "vid_local.h"
diff --git a/src/win_local.h b/src/win_local.h
index ea25806..45a2d52 100644
--- a/src/win_local.h
+++ b/src/win_local.h
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// win_local.h
//
-#include "com_local.h"
+#include "common.h"
#if USE_CLIENT
#include "key_public.h"
#include "in_public.h"