move quakedefs to q_defs

CMakeLists.txt

@@ -99,10 +99,9 @@ set(srcs
 	source/progs.h
 	source/protocol.h
 	source/q_ctype.h
+	source/q_defs.h
 	source/q_sound.h
 	source/q_stdinc.h
-	source/qs_bmp.h
-	source/quakedef.h
 	source/r_alias.c
 	source/r_brush.c
 	source/r_part.c
@@ -154,7 +153,8 @@ set(srcs
 	source/zone.h)
 
 set(srcs_linux
-	source/linux/pl_linux.c)
+	source/linux/pl_linux.c
+	source/linux/qs_bmp.h)
 
 set(srcs_osx
 	source/osx/pl_osx.c)

source/bgmusic.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "snd_codec.h"
 #include "bgmusic.h"
 #include "cdaudio.h"

source/cd_null.c

@@ -18,7 +18,7 @@
  */
 
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t CDAudio_Play(byte track, bool looping)
 {

source/cd_sdl.c

@@ -31,7 +31,7 @@
 
 #else /* defined(SDL_INIT_CDROM) */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "cdaudio.h"
 
 static bool cdValid = false;

source/cfgfile.c

@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 
 static fshandle_t               *cfg_file;

source/chase.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // chase.c -- chase camera code
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 cvar_t  chase_back = {"chase_back", "100", CVAR_NONE};
 cvar_t  chase_up = {"chase_up", "16", CVAR_NONE};

source/cl_demo.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 static void CL_FinishTimeDemo(void);
 

source/cl_input.c

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
 // rights reserved.
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t cl_maxpitch; //johnfitz -- variable pitch clamping
 extern cvar_t cl_minpitch; //johnfitz -- variable pitch clamping

source/cl_main.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_main.c  -- client main loop
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 
 // we need to declare some mouse variables here, because the menu system

source/cl_parse.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_parse.c  -- parse a message received from the server
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 
 const char *svc_strings[] =

source/cl_tent.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cl_tent.c -- client side temporary entities
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 entity_t *cl_temp_entities;
 int32_t  num_temp_entities;

source/cmd.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cmd.c -- Quake script command processing module
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 void Cmd_ForwardToServer(void);
 

source/common.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // common.c -- misc functions used in client and server
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "q_ctype.h"
 #include <errno.h>
 

source/console.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // console.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <sys/types.h>
 #include <time.h>
 #include <sys/stat.h>

source/crc.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 /* crc.c */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "crc.h"
 
 // this is a 16 bit, non-reflected CRC using the polynomial 0x1021

source/cvar.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // cvar.c -- dynamic variable tracking
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 static cvar_t   *cvar_vars;
 static char     cvar_null_string[] = "";

source/gl_draw.c

@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // draw.c -- 2d drawing
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 //extern uint8_t d_15to8table[65536]; //johnfitz -- never used
 

source/gl_fog.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //gl_fog.c -- global and volumetric fog
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 //==============================================================================
 //

source/gl_mesh.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_mesh.c: triangle model functions
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 
 /*

source/gl_model.c

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // models are the only shared resource between a client and server running
 // on the same machine.
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 qmodel_t        *loadmodel;
 char    loadname[32];   // for hunk tags

source/gl_refrag.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_efrag.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 mnode_t *r_pefragtopnode;
 

source/gl_rlight.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_light.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t r_dlightframecount;
 

source/gl_rmain.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_main.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 bool    r_cache_thrash;         // compatability
 

source/gl_rmisc.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_misc.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 //johnfitz -- new cvars
 extern cvar_t r_stereo;

source/gl_screen.c

@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 // screen.c -- master for refresh, status bar, console, chat, notify, etc
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 

source/gl_sky.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //gl_sky.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define MAX_CLIP_VERTS 64
 

source/gl_texmgr.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //gl_texmgr.c -- fitzquake's texture manager. manages opengl texture images
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 const int32_t   gl_solid_format = 3;
 const int32_t   gl_alpha_format = 4;

source/gl_vidsdl.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // gl_vidsdl.c -- SDL GL vid component
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "cfgfile.h"
 #include "bgmusic.h"
 #include <SDL.h>

source/gl_warp.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //gl_warp.c -- warping animation support
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t r_drawflat;
 

source/host.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // host.c -- coordinates spawning and killing of local servers
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 #include <setjmp.h>
 

source/host_cmd.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #if !PLATFORM_IS(WINDOWS)
 #include <dirent.h>
 #endif

source/image.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //image.c -- image loading
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #define STB_IMAGE_WRITE_STATIC

source/in_sdl.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 
 static bool     textmode;

source/keys.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /* key up events are sent even if in console mode */
 

source/linux/pl_linux.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 
 static const Uint8 bmp_bytes[] =

source/main_sdl.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 #include <stdio.h>
 

source/mathlib.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // mathlib.c -- math primitives
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 vec3_t vec3_origin = {0, 0, 0};
 

source/menu.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "bgmusic.h"
 
 void (*vid_menucmdfn)(void); //johnfitz

source/net_dgrm.c

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 #include "net_dgrm.h"
 

source/net_loop.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 #include "net_loop.h"
 

source/net_main.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 qsocket_t       *net_activeSockets = NULL;

source/osx/pl_osx.m

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <SDL.h>
 #import <Cocoa/Cocoa.h>
 

source/pr_cmds.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define STRINGTEMP_BUFFERS              16
 #define STRINGTEMP_LENGTH               1024

source/pr_edict.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_edict.c -- entity dictionary
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 dprograms_t             *progs;
 dfunction_t             *pr_functions;

source/pr_exec.c

@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 typedef struct
 {

source/q_defs.h

@@ -21,8 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#ifndef spingle__quakedef_h
-#define spingle__quakedef_h
+#ifndef spingle__q_defs_h
+#define spingle__q_defs_h
 
 #define ENGINE_NAME "spingle"
 #define VERSION     "6.90"

source/r_alias.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 //r_alias.c -- alias model rendering
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t r_drawflat, gl_overbright_models, gl_fullbrights, r_lerpmodels, r_lerpmove; //johnfitz
 

source/r_brush.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_brush.c: brush model rendering. renamed from r_surf.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t gl_fullbrights, r_drawflat, gl_overbright, r_oldwater; //johnfitz
 extern cvar_t gl_zfix; // QuakeSpasm z-fighting fix

source/r_part.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define MAX_PARTICLES                   2048    // default max # of particles at one
 //  time

source/r_sprite.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 //r_sprite.c -- sprite model rendering
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 ================

source/r_world.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // r_world.c: world model rendering
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 extern cvar_t gl_fullbrights, r_drawflat, gl_overbright, r_oldwater, r_oldskyleaf, r_showtris; //johnfitz
 

source/sbar.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sbar.c -- status bar code
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t         sb_updates;             // if >= vid.numpages, no update needed
 

source/snd_codec.c

@@ -23,7 +23,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include "snd_codec.h"
 #include "snd_codeci.h"
 

source/snd_dma.c

@@ -24,7 +24,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 "quakedef.h"
+#include "q_defs.h"
 #include "snd_codec.h"
 #include "bgmusic.h"
 

source/snd_flac.c

@@ -22,7 +22,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_FLAC)
 #include "snd_codec.h"

source/snd_mem.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // snd_mem.c: sound caching
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 ================

source/snd_mikmod.c

@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_MIKMOD)
 #include "snd_codec.h"

source/snd_mix.c

@@ -21,7 +21,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 "quakedef.h"
+#include "q_defs.h"
 
 #define PAINTBUFFER_SIZE        2048
 portable_samplepair_t paintbuffer[PAINTBUFFER_SIZE];

source/snd_mp3.c

@@ -26,7 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_MP3)
 #include "snd_codec.h"

source/snd_mpg123.c

@@ -20,7 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_MP3)
 #include "snd_codec.h"

source/snd_opus.c

@@ -21,7 +21,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_OPUS)
 #include "snd_codec.h"

source/snd_sdl.c

@@ -22,7 +22,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include <SDL.h>
 

source/snd_umx.c

@@ -27,7 +27,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include "snd_codec.h"
 #include "snd_codeci.h"

source/snd_vorbis.c

@@ -21,7 +21,7 @@
  *
  */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #if defined(USE_CODEC_VORBIS)
 #include "snd_codec.h"

source/sv_main.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_main.c -- server main program
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 server_t        sv;
 server_static_t svs;

source/sv_move.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_move.c -- monster movement
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define STEPSIZE        18
 

source/sv_phys.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_phys.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 

source/sv_user.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sv_user.c -- server code for moving users
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 edict_t *sv_player;
 

source/unix/net_bsd.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 #include "net_dgrm.h"

source/unix/net_udp.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 static sys_socket_t net_acceptsocket = INVALID_SOCKET;  // socket for fielding new connections

source/unix/sys_sdl_unix.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include <sys/types.h>
 #include <errno.h>

source/view.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // view.c -- player eye positioning
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 

source/wad.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // wad.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 int32_t                         wad_numlumps;
 lumpinfo_t              *wad_lumps;

source/windows/net_win.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 #include "net_dgrm.h"

source/windows/net_wins.c

@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "q_stdinc.h"
 #include "net_sys.h"
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 
 static sys_socket_t net_acceptsocket = INVALID_SOCKET;  // socket for fielding new connections

source/windows/net_wipx.c

@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "q_stdinc.h"
 #include "net_sys.h"
 #include <wsipx.h>
-#include "quakedef.h"
+#include "q_defs.h"
 #include "net_defs.h"
 #include "net_wipx.h"
 

source/windows/pl_win.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
-#include "quakedef.h"
+#include "q_defs.h"
 #include <windows.h>
 #include <SDL.h>
 #include <SDL_syswm.h>

source/windows/sys_sdl_win.c

@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <mmsystem.h>
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #include <sys/types.h>
 #include <errno.h>

source/world.c

@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // world.c -- world query functions
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 /*
 

source/zone.c

@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // zone.c
 
-#include "quakedef.h"
+#include "q_defs.h"
 
 #define DYNAMIC_SIZE    (4 * 1024 * 1024) // ericw -- was 512KB (64-bit) / 384KB (32-bit)