From 5765f7fe5dda655d8b5bd1a8cfe553c50a05d9f8 Mon Sep 17 00:00:00 2001 From: "Zephaniah E. Hull" Date: Sun, 26 Dec 1999 06:37:28 +0000 Subject: [PATCH] BIG merge work, POQ now compiles, though at least glquake.3dfx has, err, issues.. Hopefully QW will still compile and work, thats the next commit I think.. --- Makefile | 2 +- common/gl_vidlinuxglx.c | 5 - common/gl_vidnt.c | 8 - common/snd_dma.c | 2 + common/vid.h | 3 - common/vid_sunxil.c | 4 - common/vid_svgalib.c | 8 - common/vid_x.c | 9 - common/view.h | 4 +- qw_client/gl_vidlinux.c | 4 - qw_client/gl_vidlinux_x11.c | 5 - qw_common/client.h | 66 ++--- qw_common/protocol.h | 2 + qw_common/quakedef.h | 115 +------- standalone/Makefile | 492 +++++++++++++++++----------------- standalone/cl_parse.c | 8 +- standalone/draw.c | 8 +- standalone/gl_draw.c | 4 +- standalone/include/client.h | 64 ++--- standalone/include/quakedef.h | 125 +-------- standalone/include/view.h | 35 --- standalone/sv_main.c | 6 +- standalone/sys_linux.c | 2 +- 23 files changed, 341 insertions(+), 640 deletions(-) delete mode 100644 standalone/include/view.h diff --git a/Makefile b/Makefile index 6e58280..133ac8a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SUBDIRS = qw_client qw_server #standalone #standalone isn't done merging yet +SUBDIRS = qw_client qw_server standalone #standalone isn't done merging yet all %: for dir in $(SUBDIRS); do \ diff --git a/common/gl_vidlinuxglx.c b/common/gl_vidlinuxglx.c index 56cc6c7..2a72178 100644 --- a/common/gl_vidlinuxglx.c +++ b/common/gl_vidlinuxglx.c @@ -761,8 +761,3 @@ void IN_Move (usercmd_t *cmd) { IN_MouseMove(cmd); } - - -void VID_UnlockBuffer() {} -void VID_LockBuffer() {} - diff --git a/common/gl_vidnt.c b/common/gl_vidnt.c index 932a68d..88725c9 100644 --- a/common/gl_vidnt.c +++ b/common/gl_vidnt.c @@ -166,14 +166,6 @@ void VID_ForceLockState (int lk) { } -void VID_LockBuffer (void) -{ -} - -void VID_UnlockBuffer (void) -{ -} - int VID_ForceUnlockedAndReturnState (void) { return 0; diff --git a/common/snd_dma.c b/common/snd_dma.c index c8bde7c..69b137c 100644 --- a/common/snd_dma.c +++ b/common/snd_dma.c @@ -33,7 +33,9 @@ void S_StopAllSounds(qboolean clear); void S_StopAllSoundsC(void); // QuakeWorld hack +#ifdef QUAKEWORLD #define viewentity playernum+1 +#endif // QUAKEWORLD // ======================================================================= // Internal sound data & structures diff --git a/common/vid.h b/common/vid.h index 9317466..40dc9f8 100644 --- a/common/vid.h +++ b/common/vid.h @@ -83,9 +83,6 @@ int VID_SetMode (int modenum, unsigned char *palette); void VID_HandlePause (qboolean pause); // called only on Win32, when pause happens, so the mouse can be released -void VID_LockBuffer (void); -void VID_UnlockBuffer (void); - #ifdef GLQUAKE qboolean VID_Is8bit(void); #endif diff --git a/common/vid_sunxil.c b/common/vid_sunxil.c index 05e22a7..9a36f86 100644 --- a/common/vid_sunxil.c +++ b/common/vid_sunxil.c @@ -1282,7 +1282,3 @@ void IN_Move (usercmd_t *cmd) } mouse_x = mouse_y = 0.0; } - -//void VID_UnlockBuffer(void) { } -//void VID_LockBuffer(void) { } - diff --git a/common/vid_svgalib.c b/common/vid_svgalib.c index 1f3a116..9067916 100644 --- a/common/vid_svgalib.c +++ b/common/vid_svgalib.c @@ -1018,11 +1018,3 @@ char *VID_ModeInfo (int modenum) return (badmodestr); } } - -void VID_LockBuffer ( void ) -{ -} - -void VID_UnlockBuffer ( void ) -{ -} diff --git a/common/vid_x.c b/common/vid_x.c index f11cb1e..a8c16a0 100644 --- a/common/vid_x.c +++ b/common/vid_x.c @@ -1100,12 +1100,3 @@ void IN_Move (usercmd_t *cmd) } mouse_x = mouse_y = 0.0; } - -void VID_LockBuffer (void) -{ -} - -void VID_UnlockBuffer (void) -{ -} - diff --git a/common/view.h b/common/view.h index 39769dd..b546b20 100644 --- a/common/view.h +++ b/common/view.h @@ -23,10 +23,10 @@ extern cvar_t v_gamma; extern byte gammatable[256]; // palette is sent through this extern byte ramps[3][256]; -#ifdef GLQUAKE +//#ifdef GLQUAKE extern float v_blend[4]; extern cvar_t lcd_x; -#endif +//#endif void V_Init (void); void V_RenderView (void); diff --git a/qw_client/gl_vidlinux.c b/qw_client/gl_vidlinux.c index c5dbdcf..f623340 100644 --- a/qw_client/gl_vidlinux.c +++ b/qw_client/gl_vidlinux.c @@ -818,7 +818,3 @@ void IN_Move (usercmd_t *cmd) { IN_MouseMove(cmd); } - -void VID_UnlockBuffer() {} -void VID_LockBuffer() {} - diff --git a/qw_client/gl_vidlinux_x11.c b/qw_client/gl_vidlinux_x11.c index 8ffc689..f346054 100644 --- a/qw_client/gl_vidlinux_x11.c +++ b/qw_client/gl_vidlinux_x11.c @@ -863,8 +863,3 @@ void IN_Move (usercmd_t *cmd) } mouse_x = mouse_y = 0.0; } - - -void VID_LockBuffer (void) {} -void VID_UnlockBuffer (void) {} - diff --git a/qw_common/client.h b/qw_common/client.h index 97ec71c..154bddb 100644 --- a/qw_common/client.h +++ b/qw_common/client.h @@ -207,46 +207,46 @@ extern client_static_t cls; // typedef struct { - int servercount; // server identification for prespawns + int servercount; // server identification for prespawns - char serverinfo[MAX_SERVERINFO_STRING]; + char serverinfo[MAX_SERVERINFO_STRING]; - int parsecount; // server message counter - int validsequence; // this is the sequence number of the last good - // packetentity_t we got. If this is 0, we can't - // render a frame yet - int movemessages; // since connecting to this server - // throw out the first couple, so the player - // doesn't accidentally do something the - // first frame + int parsecount; // server message counter + int validsequence; // this is the sequence number of the last good + // packetentity_t we got. If this is 0, we can't + // render a frame yet + int movemessages; // since connecting to this server + // throw out the first couple, so the player + // doesn't accidentally do something the + // first frame - int spectator; + int spectator; - double last_ping_request; // while showing scoreboard - double last_servermessage; + double last_ping_request; // while showing scoreboard + double last_servermessage; // sentcmds[cl.netchan.outgoing_sequence & UPDATE_MASK] = cmd frame_t frames[UPDATE_BACKUP]; // information for local display - int stats[MAX_CL_STATS]; // health, etc - float item_gettime[32]; // cl.time of aquiring item, for blinking - float faceanimtime; // use anim frame if cl.time < this + int stats[MAX_CL_STATS]; // health, etc + float item_gettime[32]; //cl.time of aquiring item, for blinking + float faceanimtime; // use anim frame if cl.time < this - cshift_t cshifts[NUM_CSHIFTS]; // color shifts for damage, powerups - cshift_t prev_cshifts[NUM_CSHIFTS]; // and content types + cshift_t cshifts[NUM_CSHIFTS]; // color shifts for damage, powerups + cshift_t prev_cshifts[NUM_CSHIFTS]; // and content types // the client maintains its own idea of view angles, which are // sent to the server each frame. And only reset at level change // and teleport times - vec3_t viewangles; + vec3_t viewangles; // the client simulates or interpolates movement to get these values - double time; // this is the time value that the client - // is rendering at. allways <= realtime - vec3_t simorg; - vec3_t simvel; - vec3_t simangles; + double time; // this is the time value that the client + // is rendering at. allways <= realtime + vec3_t simorg; + vec3_t simvel; + vec3_t simangles; // pitch drifting vars float pitchvel; @@ -255,14 +255,14 @@ typedef struct double laststop; - float crouch; // local amount for smoothing stepups + float crouch; // local amount for smoothing stepups - qboolean paused; // send over by server + qboolean paused; // send over by server - float punchangle; // temporar yview kick from weapon firing + float punchangle; // temporar yview kick from weapon firing - int intermission; // don't change view angle, full screen, etc - int completed_time; // latched ffrom time at intermission start + int intermission; // don't change view angle, full screen, etc + int completed_time; // latched ffrom time at intermission start // // information that is static for the entire time connected to a server @@ -274,15 +274,15 @@ typedef struct struct sfx_s *sound_precache[MAX_SOUNDS]; char levelname[40]; // for display on solo scoreboard - int playernum; + int playernum; // refresh related state struct model_s *worldmodel; // cl_entitites[0].model struct efrag_s *free_efrags; - int num_entities; // stored bottom up in cl_entities array - int num_statics; // stored top down in cl_entitiers + int num_entities; // stored bottom up in cl_entities array + int num_statics; // stored top down in cl_entitiers - int cdtrack; // cd audio + int cdtrack; // cd audio entity_t viewent; // weapon model diff --git a/qw_common/protocol.h b/qw_common/protocol.h index f674c1b..de43dee 100644 --- a/qw_common/protocol.h +++ b/qw_common/protocol.h @@ -249,6 +249,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // entity_state_t is the information conveyed from the server // in an update message +/* typedef struct { int number; // edict index @@ -262,6 +263,7 @@ typedef struct int skinnum; int effects; } entity_state_t; +*/ #define MAX_PACKET_ENTITIES 64 // doesn't count nails diff --git a/qw_common/quakedef.h b/qw_common/quakedef.h index 2a69d7e..ef15d38 100644 --- a/qw_common/quakedef.h +++ b/qw_common/quakedef.h @@ -19,124 +19,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // quakedef.h -- primary header for client -#define QUAKE_GAME // as opposed to utilities - -//define PARANOID // speed sapping error checking - -#ifdef _WIN32 -#pragma warning( disable : 4244 4127 4201 4214 4514 4305 4115 4018) -#endif - - -#include -#include -#include -#include -#include -#include -#include +#include #include "bothdefs.h" - -#include "common.h" -#include "bspfile.h" -#include "vid.h" -#include "sys.h" -#include "zone.h" -#include "mathlib.h" -#include "wad.h" -#include "draw.h" -#include "cvar.h" -#include "screen.h" -#include "net.h" -#include "protocol.h" -#include "cmd.h" -#include "sbar.h" -#include "sound.h" -#include "render.h" -#include "client.h" - -#ifdef GLQUAKE -#include "gl_model.h" -#else -#include "model.h" -#include "d_iface.h" -#endif - -#include "input.h" -#include "keys.h" -#include "console.h" -#include "view.h" -#include "menu.h" -#include "crc.h" -#include "cdaudio.h" #include "pmove.h" -#ifdef GLQUAKE -#include "glquake.h" -#endif - -#ifndef max -#define max(a,b) ((a) > (b) ? (a) : (b)) -#define min(a,b) ((a) < (b) ? (a) : (b)) -#endif - -//============================================================================= - -// the host system specifies the base of the directory tree, the -// command line parms passed to the program, and the amount of memory -// available for the program to use - -typedef struct -{ - char *basedir; - char *cachedir; // for development over ISDN lines - int argc; - char **argv; - void *membase; - int memsize; -} quakeparms_t; - - -//============================================================================= - -#define MAX_NUM_ARGVS 50 - - -extern qboolean noclip_anglehack; - - -// -// host -// -extern quakeparms_t host_parms; - -extern cvar_t sys_ticrate; -extern cvar_t sys_nostdout; -extern cvar_t developer; - extern cvar_t password; -extern qboolean host_initialized; // true if into command execution -extern double host_frametime; -extern byte *host_basepal; -extern byte *host_colormap; -extern int host_framecount; // incremented every frame, never reset -extern double realtime; // not bounded in any way, changed at - // start of every frame, never reset - -void Host_ServerFrame (void); -void Host_InitCommands (void); -void Host_Init (quakeparms_t *parms); -void Host_Shutdown(void); -void Host_Error (char *error, ...); -void Host_EndGame (char *message, ...); qboolean Host_SimulationTime(float time); -void Host_Frame (float time); -void Host_Quit_f (void); -void Host_ClientCommands (char *fmt, ...); -void Host_ShutdownServer (qboolean crash); - -extern qboolean msg_suppress_1; // suppresses resolution and cache size console output - // an fullscreen DIB focus gain/loss - diff --git a/standalone/Makefile b/standalone/Makefile index 0862c58..c3f5fbc 100644 --- a/standalone/Makefile +++ b/standalone/Makefile @@ -22,7 +22,7 @@ ARCH=i386 endif NOARCH=noarch -ROOT_DIR=/home/deek/Source/Quake/WinQuake +ROOT_DIR=$(shell pwd) BUILD_DEBUG_DIR=debug-$(ARCH)$(GLIBC) BUILD_RELEASE_DIR=release-$(ARCH)$(GLIBC) @@ -31,7 +31,15 @@ GL_DIR=/usr/src/mesa-3.0 CC=gcc -BASE_CFLAGS=-Dstricmp=strcasecmp +PROJECT_DIR=.. + +COMMON_DIR=$(PROJECT_DIR)/common +POQ_DIR=$(PROJECT_DIR)/standalone + + +INCL=-I. -I$(COMMON_DIR) -I$(POQ_DIR)/include + +BASE_CFLAGS=$(INCL) -Dstricmp=strcasecmp DEBUG_CFLAGS=$(BASE_CFLAGS) -g ifeq ($(ARCH),axp) @@ -50,7 +58,7 @@ LDFLAGS=-lm SVGA_LDFLAGS=-lvga X11_LDFLAGS=-L$(X11_DIR)/lib -lX11 -lXext -lXxf86dga GL_LDFLAGS=-L$(X11_DIR)/lib -L$(MESA_DIR)/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lglide2x -lXxf86dga -lXxf86vm -GLIDE_LDFLAGS=-L$(X11_DIR)/lib -L$(MESA_DIR)/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lglide2x -lXxf86dga -lXxf86vm -lm +GLIDE_LDFLAGS=-L$(X11_DIR)/lib -L$(MESA_DIR)/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lglide2x -lXxf86dga -lXxf86vm -lm -lvga #GLLDFLAGS=-L/usr/X11R6/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lXxf86dga -lXxf86vm -lm @@ -200,276 +208,276 @@ $(BUILDDIR)/bin/squake : $(SQUAKE_OBJS) #### -$(BUILDDIR)/squake/cl_demo.o : $(ROOT_DIR)/cl_demo.c +$(BUILDDIR)/squake/cl_demo.o : $(PROJECT_DIR)/standalone/cl_demo.c $(DO_CC) -$(BUILDDIR)/squake/cl_input.o : $(ROOT_DIR)/cl_input.c +$(BUILDDIR)/squake/cl_input.o : $(PROJECT_DIR)/standalone/cl_input.c $(DO_CC) -$(BUILDDIR)/squake/cl_main.o : $(ROOT_DIR)/cl_main.c +$(BUILDDIR)/squake/cl_main.o : $(PROJECT_DIR)/standalone/cl_main.c $(DO_CC) -$(BUILDDIR)/squake/cl_parse.o : $(ROOT_DIR)/cl_parse.c +$(BUILDDIR)/squake/cl_parse.o : $(PROJECT_DIR)/standalone/cl_parse.c $(DO_CC) -$(BUILDDIR)/squake/cl_tent.o : $(ROOT_DIR)/cl_tent.c +$(BUILDDIR)/squake/cl_tent.o : $(PROJECT_DIR)/standalone/cl_tent.c $(DO_CC) -$(BUILDDIR)/squake/chase.o : $(ROOT_DIR)/chase.c +$(BUILDDIR)/squake/chase.o : $(PROJECT_DIR)/standalone/chase.c $(DO_CC) -$(BUILDDIR)/squake/cmd.o : $(ROOT_DIR)/cmd.c +$(BUILDDIR)/squake/cmd.o : $(PROJECT_DIR)/standalone/cmd.c $(DO_CC) -$(BUILDDIR)/squake/common.o : $(ROOT_DIR)/common.c +$(BUILDDIR)/squake/common.o : $(PROJECT_DIR)/standalone/common.c $(DO_DEBUG_CC) -$(BUILDDIR)/squake/console.o : $(ROOT_DIR)/console.c +$(BUILDDIR)/squake/console.o : $(PROJECT_DIR)/standalone/console.c $(DO_CC) -$(BUILDDIR)/squake/crc.o : $(ROOT_DIR)/crc.c +$(BUILDDIR)/squake/crc.o : $(PROJECT_DIR)/standalone/crc.c $(DO_CC) -$(BUILDDIR)/squake/cvar.o : $(ROOT_DIR)/cvar.c +$(BUILDDIR)/squake/cvar.o : $(PROJECT_DIR)/standalone/cvar.c $(DO_CC) -$(BUILDDIR)/squake/draw.o : $(ROOT_DIR)/draw.c +$(BUILDDIR)/squake/draw.o : $(PROJECT_DIR)/standalone/draw.c $(DO_CC) -$(BUILDDIR)/squake/d_edge.o : $(ROOT_DIR)/d_edge.c +$(BUILDDIR)/squake/d_edge.o : $(PROJECT_DIR)/standalone/d_edge.c $(DO_CC) -$(BUILDDIR)/squake/d_fill.o : $(ROOT_DIR)/d_fill.c +$(BUILDDIR)/squake/d_fill.o : $(PROJECT_DIR)/standalone/d_fill.c $(DO_CC) -$(BUILDDIR)/squake/d_init.o : $(ROOT_DIR)/d_init.c +$(BUILDDIR)/squake/d_init.o : $(PROJECT_DIR)/standalone/d_init.c $(DO_CC) -$(BUILDDIR)/squake/d_modech.o : $(ROOT_DIR)/d_modech.c +$(BUILDDIR)/squake/d_modech.o : $(PROJECT_DIR)/standalone/d_modech.c $(DO_CC) -$(BUILDDIR)/squake/d_part.o : $(ROOT_DIR)/d_part.c +$(BUILDDIR)/squake/d_part.o : $(PROJECT_DIR)/standalone/d_part.c $(DO_CC) -$(BUILDDIR)/squake/d_polyse.o : $(ROOT_DIR)/d_polyse.c +$(BUILDDIR)/squake/d_polyse.o : $(PROJECT_DIR)/standalone/d_polyse.c $(DO_CC) -$(BUILDDIR)/squake/d_scan.o : $(ROOT_DIR)/d_scan.c +$(BUILDDIR)/squake/d_scan.o : $(PROJECT_DIR)/standalone/d_scan.c $(DO_CC) -$(BUILDDIR)/squake/d_sky.o : $(ROOT_DIR)/d_sky.c +$(BUILDDIR)/squake/d_sky.o : $(PROJECT_DIR)/standalone/d_sky.c $(DO_CC) -$(BUILDDIR)/squake/d_sprite.o : $(ROOT_DIR)/d_sprite.c +$(BUILDDIR)/squake/d_sprite.o : $(PROJECT_DIR)/standalone/d_sprite.c $(DO_CC) -$(BUILDDIR)/squake/d_surf.o : $(ROOT_DIR)/d_surf.c +$(BUILDDIR)/squake/d_surf.o : $(PROJECT_DIR)/standalone/d_surf.c $(DO_CC) -$(BUILDDIR)/squake/d_vars.o : $(ROOT_DIR)/d_vars.c +$(BUILDDIR)/squake/d_vars.o : $(PROJECT_DIR)/standalone/d_vars.c $(DO_CC) -$(BUILDDIR)/squake/d_zpoint.o : $(ROOT_DIR)/d_zpoint.c +$(BUILDDIR)/squake/d_zpoint.o : $(PROJECT_DIR)/standalone/d_zpoint.c $(DO_CC) -$(BUILDDIR)/squake/host.o : $(ROOT_DIR)/host.c +$(BUILDDIR)/squake/host.o : $(PROJECT_DIR)/standalone/host.c $(DO_CC) -$(BUILDDIR)/squake/host_cmd.o : $(ROOT_DIR)/host_cmd.c +$(BUILDDIR)/squake/host_cmd.o : $(PROJECT_DIR)/standalone/host_cmd.c $(DO_CC) -$(BUILDDIR)/squake/keys.o : $(ROOT_DIR)/keys.c +$(BUILDDIR)/squake/keys.o : $(PROJECT_DIR)/standalone/keys.c $(DO_CC) -$(BUILDDIR)/squake/menu.o : $(ROOT_DIR)/menu.c +$(BUILDDIR)/squake/menu.o : $(PROJECT_DIR)/standalone/menu.c $(DO_CC) -$(BUILDDIR)/squake/mathlib.o : $(ROOT_DIR)/mathlib.c +$(BUILDDIR)/squake/mathlib.o : $(PROJECT_DIR)/common/mathlib.c $(DO_CC) -$(BUILDDIR)/squake/model.o : $(ROOT_DIR)/model.c +$(BUILDDIR)/squake/model.o : $(PROJECT_DIR)/standalone/model.c $(DO_CC) -$(BUILDDIR)/squake/net_dgrm.o : $(ROOT_DIR)/net_dgrm.c +$(BUILDDIR)/squake/net_dgrm.o : $(PROJECT_DIR)/standalone/net_dgrm.c $(DO_CC) -$(BUILDDIR)/squake/net_loop.o : $(ROOT_DIR)/net_loop.c +$(BUILDDIR)/squake/net_loop.o : $(PROJECT_DIR)/standalone/net_loop.c $(DO_CC) -$(BUILDDIR)/squake/net_main.o : $(ROOT_DIR)/net_main.c +$(BUILDDIR)/squake/net_main.o : $(PROJECT_DIR)/standalone/net_main.c $(DO_CC) -$(BUILDDIR)/squake/net_vcr.o : $(ROOT_DIR)/net_vcr.c +$(BUILDDIR)/squake/net_vcr.o : $(PROJECT_DIR)/standalone/net_vcr.c $(DO_CC) -$(BUILDDIR)/squake/net_udp.o : $(ROOT_DIR)/net_udp.c +$(BUILDDIR)/squake/net_udp.o : $(PROJECT_DIR)/standalone/net_udp.c $(DO_CC) -$(BUILDDIR)/squake/net_bsd.o : $(ROOT_DIR)/net_bsd.c +$(BUILDDIR)/squake/net_bsd.o : $(PROJECT_DIR)/standalone/net_bsd.c $(DO_CC) -$(BUILDDIR)/squake/nonintel.o : $(ROOT_DIR)/nonintel.c +$(BUILDDIR)/squake/nonintel.o : $(PROJECT_DIR)/standalone/nonintel.c $(DO_CC) -$(BUILDDIR)/squake/pr_cmds.o : $(ROOT_DIR)/pr_cmds.c +$(BUILDDIR)/squake/pr_cmds.o : $(PROJECT_DIR)/standalone/pr_cmds.c $(DO_CC) -$(BUILDDIR)/squake/pr_edict.o : $(ROOT_DIR)/pr_edict.c +$(BUILDDIR)/squake/pr_edict.o : $(PROJECT_DIR)/standalone/pr_edict.c $(DO_CC) -$(BUILDDIR)/squake/pr_exec.o : $(ROOT_DIR)/pr_exec.c +$(BUILDDIR)/squake/pr_exec.o : $(PROJECT_DIR)/standalone/pr_exec.c $(DO_CC) -$(BUILDDIR)/squake/r_aclip.o : $(ROOT_DIR)/r_aclip.c +$(BUILDDIR)/squake/r_aclip.o : $(PROJECT_DIR)/standalone/r_aclip.c $(DO_CC) -$(BUILDDIR)/squake/r_alias.o : $(ROOT_DIR)/r_alias.c +$(BUILDDIR)/squake/r_alias.o : $(PROJECT_DIR)/standalone/r_alias.c $(DO_CC) -$(BUILDDIR)/squake/r_bsp.o : $(ROOT_DIR)/r_bsp.c +$(BUILDDIR)/squake/r_bsp.o : $(PROJECT_DIR)/standalone/r_bsp.c $(DO_CC) -$(BUILDDIR)/squake/r_light.o : $(ROOT_DIR)/r_light.c +$(BUILDDIR)/squake/r_light.o : $(PROJECT_DIR)/standalone/r_light.c $(DO_CC) -$(BUILDDIR)/squake/r_draw.o : $(ROOT_DIR)/r_draw.c +$(BUILDDIR)/squake/r_draw.o : $(PROJECT_DIR)/standalone/r_draw.c $(DO_CC) -$(BUILDDIR)/squake/r_efrag.o : $(ROOT_DIR)/r_efrag.c +$(BUILDDIR)/squake/r_efrag.o : $(PROJECT_DIR)/standalone/r_efrag.c $(DO_CC) -$(BUILDDIR)/squake/r_edge.o : $(ROOT_DIR)/r_edge.c +$(BUILDDIR)/squake/r_edge.o : $(PROJECT_DIR)/standalone/r_edge.c $(DO_CC) -$(BUILDDIR)/squake/r_misc.o : $(ROOT_DIR)/r_misc.c +$(BUILDDIR)/squake/r_misc.o : $(PROJECT_DIR)/standalone/r_misc.c $(DO_CC) -$(BUILDDIR)/squake/r_main.o : $(ROOT_DIR)/r_main.c +$(BUILDDIR)/squake/r_main.o : $(PROJECT_DIR)/standalone/r_main.c $(DO_CC) -$(BUILDDIR)/squake/r_sky.o : $(ROOT_DIR)/r_sky.c +$(BUILDDIR)/squake/r_sky.o : $(PROJECT_DIR)/standalone/r_sky.c $(DO_CC) -$(BUILDDIR)/squake/r_sprite.o : $(ROOT_DIR)/r_sprite.c +$(BUILDDIR)/squake/r_sprite.o : $(PROJECT_DIR)/standalone/r_sprite.c $(DO_CC) -$(BUILDDIR)/squake/r_surf.o : $(ROOT_DIR)/r_surf.c +$(BUILDDIR)/squake/r_surf.o : $(PROJECT_DIR)/standalone/r_surf.c $(DO_CC) -$(BUILDDIR)/squake/r_part.o : $(ROOT_DIR)/r_part.c +$(BUILDDIR)/squake/r_part.o : $(PROJECT_DIR)/standalone/r_part.c $(DO_CC) -$(BUILDDIR)/squake/r_vars.o : $(ROOT_DIR)/r_vars.c +$(BUILDDIR)/squake/r_vars.o : $(PROJECT_DIR)/standalone/r_vars.c $(DO_CC) -$(BUILDDIR)/squake/screen.o : $(ROOT_DIR)/screen.c +$(BUILDDIR)/squake/screen.o : $(PROJECT_DIR)/standalone/screen.c $(DO_CC) -$(BUILDDIR)/squake/sbar.o : $(ROOT_DIR)/sbar.c +$(BUILDDIR)/squake/sbar.o : $(PROJECT_DIR)/standalone/sbar.c $(DO_CC) -$(BUILDDIR)/squake/sv_main.o : $(ROOT_DIR)/sv_main.c +$(BUILDDIR)/squake/sv_main.o : $(PROJECT_DIR)/standalone/sv_main.c $(DO_CC) -$(BUILDDIR)/squake/sv_phys.o : $(ROOT_DIR)/sv_phys.c +$(BUILDDIR)/squake/sv_phys.o : $(PROJECT_DIR)/standalone/sv_phys.c $(DO_CC) -$(BUILDDIR)/squake/sv_move.o : $(ROOT_DIR)/sv_move.c +$(BUILDDIR)/squake/sv_move.o : $(PROJECT_DIR)/standalone/sv_move.c $(DO_CC) -$(BUILDDIR)/squake/sv_user.o : $(ROOT_DIR)/sv_user.c +$(BUILDDIR)/squake/sv_user.o : $(PROJECT_DIR)/standalone/sv_user.c $(DO_CC) -$(BUILDDIR)/squake/zone.o : $(ROOT_DIR)/zone.c +$(BUILDDIR)/squake/zone.o : $(PROJECT_DIR)/common/zone.c $(DO_CC) -$(BUILDDIR)/squake/view.o : $(ROOT_DIR)/view.c +$(BUILDDIR)/squake/view.o : $(PROJECT_DIR)/standalone/view.c $(DO_CC) -$(BUILDDIR)/squake/wad.o : $(ROOT_DIR)/wad.c +$(BUILDDIR)/squake/wad.o : $(PROJECT_DIR)/common/wad.c $(DO_CC) -$(BUILDDIR)/squake/world.o : $(ROOT_DIR)/world.c +$(BUILDDIR)/squake/world.o : $(PROJECT_DIR)/standalone/world.c $(DO_CC) -$(BUILDDIR)/squake/cd_linux.o : $(ROOT_DIR)/cd_linux.c +$(BUILDDIR)/squake/cd_linux.o : $(PROJECT_DIR)/common/cd_linux.c $(DO_CC) -$(BUILDDIR)/squake/sys_linux.o :$(ROOT_DIR)/sys_linux.c +$(BUILDDIR)/squake/sys_linux.o :$(PROJECT_DIR)/standalone/sys_linux.c $(DO_CC) -$(BUILDDIR)/squake/vid_svgalib.o:$(ROOT_DIR)/vid_svgalib.c +$(BUILDDIR)/squake/vid_svgalib.o:$(PROJECT_DIR)/common/vid_svgalib.c $(DO_O_CC) -$(BUILDDIR)/squake/snd_dma.o : $(ROOT_DIR)/snd_dma.c +$(BUILDDIR)/squake/snd_dma.o : $(PROJECT_DIR)/common/snd_dma.c $(DO_CC) -$(BUILDDIR)/squake/snd_mem.o : $(ROOT_DIR)/snd_mem.c +$(BUILDDIR)/squake/snd_mem.o : $(PROJECT_DIR)/common/snd_mem.c $(DO_CC) -$(BUILDDIR)/squake/snd_mix.o : $(ROOT_DIR)/snd_mix.c +$(BUILDDIR)/squake/snd_mix.o : $(PROJECT_DIR)/common/snd_mix.c $(DO_CC) -$(BUILDDIR)/squake/snd_linux.o :$(ROOT_DIR)/snd_linux.c +$(BUILDDIR)/squake/snd_linux.o :$(PROJECT_DIR)/common/snd_linux.c $(DO_CC) ##### -$(BUILDDIR)/squake/d_copy.o : $(ROOT_DIR)/d_copy.s +$(BUILDDIR)/squake/d_copy.o : $(PROJECT_DIR)/standalone/d_copy.s $(DO_AS) -$(BUILDDIR)/squake/d_draw.o : $(ROOT_DIR)/d_draw.s +$(BUILDDIR)/squake/d_draw.o : $(PROJECT_DIR)/standalone/d_draw.s $(DO_AS) -$(BUILDDIR)/squake/d_draw16.o : $(ROOT_DIR)/d_draw16.s +$(BUILDDIR)/squake/d_draw16.o : $(PROJECT_DIR)/standalone/d_draw16.s $(DO_AS) -$(BUILDDIR)/squake/d_parta.o : $(ROOT_DIR)/d_parta.s +$(BUILDDIR)/squake/d_parta.o : $(PROJECT_DIR)/standalone/d_parta.s $(DO_AS) -$(BUILDDIR)/squake/d_polysa.o : $(ROOT_DIR)/d_polysa.s +$(BUILDDIR)/squake/d_polysa.o : $(PROJECT_DIR)/standalone/d_polysa.s $(DO_AS) -$(BUILDDIR)/squake/d_scana.o : $(ROOT_DIR)/d_scana.s +$(BUILDDIR)/squake/d_scana.o : $(PROJECT_DIR)/standalone/d_scana.s $(DO_AS) -$(BUILDDIR)/squake/d_spr8.o : $(ROOT_DIR)/d_spr8.s +$(BUILDDIR)/squake/d_spr8.o : $(PROJECT_DIR)/standalone/d_spr8.s $(DO_AS) -$(BUILDDIR)/squake/d_varsa.o : $(ROOT_DIR)/d_varsa.s +$(BUILDDIR)/squake/d_varsa.o : $(PROJECT_DIR)/standalone/d_varsa.s $(DO_AS) -$(BUILDDIR)/squake/math.o : $(ROOT_DIR)/math.s +$(BUILDDIR)/squake/math.o : $(PROJECT_DIR)/common/math.s $(DO_AS) -$(BUILDDIR)/squake/r_aliasa.o : $(ROOT_DIR)/r_aliasa.s +$(BUILDDIR)/squake/r_aliasa.o : $(PROJECT_DIR)/standalone/r_aliasa.s $(DO_AS) -$(BUILDDIR)/squake/r_drawa.o : $(ROOT_DIR)/r_drawa.s +$(BUILDDIR)/squake/r_drawa.o : $(PROJECT_DIR)/standalone/r_drawa.s $(DO_AS) -$(BUILDDIR)/squake/r_edgea.o : $(ROOT_DIR)/r_edgea.s +$(BUILDDIR)/squake/r_edgea.o : $(PROJECT_DIR)/standalone/r_edgea.s $(DO_AS) -$(BUILDDIR)/squake/r_varsa.o : $(ROOT_DIR)/r_varsa.s +$(BUILDDIR)/squake/r_varsa.o : $(PROJECT_DIR)/standalone/r_varsa.s $(DO_AS) -$(BUILDDIR)/squake/surf16.o : $(ROOT_DIR)/surf16.s +$(BUILDDIR)/squake/surf16.o : $(PROJECT_DIR)/standalone/surf16.s $(DO_AS) -$(BUILDDIR)/squake/surf8.o : $(ROOT_DIR)/surf8.s +$(BUILDDIR)/squake/surf8.o : $(PROJECT_DIR)/standalone/surf8.s $(DO_AS) -$(BUILDDIR)/squake/worlda.o : $(ROOT_DIR)/worlda.s +$(BUILDDIR)/squake/worlda.o : $(PROJECT_DIR)/standalone/worlda.s $(DO_AS) -$(BUILDDIR)/squake/r_aclipa.o : $(ROOT_DIR)/r_aclipa.s +$(BUILDDIR)/squake/r_aclipa.o : $(PROJECT_DIR)/standalone/r_aclipa.s $(DO_AS) -$(BUILDDIR)/squake/snd_mixa.o : $(ROOT_DIR)/snd_mixa.s +$(BUILDDIR)/squake/snd_mixa.o : $(PROJECT_DIR)/common/snd_mixa.s $(DO_AS) -$(BUILDDIR)/squake/sys_dosa.o : $(ROOT_DIR)/sys_dosa.s +$(BUILDDIR)/squake/sys_dosa.o : $(PROJECT_DIR)/standalone/sys_dosa.s $(DO_AS) ############################################################################# @@ -573,276 +581,276 @@ $(BUILDDIR)/bin/xquake : $(X11_OBJS) #### -$(BUILDDIR)/x11/cl_demo.o : $(ROOT_DIR)/cl_demo.c +$(BUILDDIR)/x11/cl_demo.o : $(PROJECT_DIR)/standalone/cl_demo.c $(DO_X11_CC) -$(BUILDDIR)/x11/cl_input.o : $(ROOT_DIR)/cl_input.c +$(BUILDDIR)/x11/cl_input.o : $(PROJECT_DIR)/standalone/cl_input.c $(DO_X11_CC) -$(BUILDDIR)/x11/cl_main.o : $(ROOT_DIR)/cl_main.c +$(BUILDDIR)/x11/cl_main.o : $(PROJECT_DIR)/standalone/cl_main.c $(DO_X11_CC) -$(BUILDDIR)/x11/cl_parse.o : $(ROOT_DIR)/cl_parse.c +$(BUILDDIR)/x11/cl_parse.o : $(PROJECT_DIR)/standalone/cl_parse.c $(DO_X11_CC) -$(BUILDDIR)/x11/cl_tent.o : $(ROOT_DIR)/cl_tent.c +$(BUILDDIR)/x11/cl_tent.o : $(PROJECT_DIR)/standalone/cl_tent.c $(DO_X11_CC) -$(BUILDDIR)/x11/chase.o : $(ROOT_DIR)/chase.c +$(BUILDDIR)/x11/chase.o : $(PROJECT_DIR)/standalone/chase.c $(DO_X11_CC) -$(BUILDDIR)/x11/cmd.o : $(ROOT_DIR)/cmd.c +$(BUILDDIR)/x11/cmd.o : $(PROJECT_DIR)/standalone/cmd.c $(DO_X11_CC) -$(BUILDDIR)/x11/common.o : $(ROOT_DIR)/common.c +$(BUILDDIR)/x11/common.o : $(PROJECT_DIR)/standalone/common.c $(DO_X11_DEBUG_CC) -$(BUILDDIR)/x11/console.o : $(ROOT_DIR)/console.c +$(BUILDDIR)/x11/console.o : $(PROJECT_DIR)/standalone/console.c $(DO_X11_CC) -$(BUILDDIR)/x11/crc.o : $(ROOT_DIR)/crc.c +$(BUILDDIR)/x11/crc.o : $(PROJECT_DIR)/standalone/crc.c $(DO_X11_CC) -$(BUILDDIR)/x11/cvar.o : $(ROOT_DIR)/cvar.c +$(BUILDDIR)/x11/cvar.o : $(PROJECT_DIR)/standalone/cvar.c $(DO_X11_CC) -$(BUILDDIR)/x11/draw.o : $(ROOT_DIR)/draw.c +$(BUILDDIR)/x11/draw.o : $(PROJECT_DIR)/standalone/draw.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_edge.o : $(ROOT_DIR)/d_edge.c +$(BUILDDIR)/x11/d_edge.o : $(PROJECT_DIR)/standalone/d_edge.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_fill.o : $(ROOT_DIR)/d_fill.c +$(BUILDDIR)/x11/d_fill.o : $(PROJECT_DIR)/standalone/d_fill.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_init.o : $(ROOT_DIR)/d_init.c +$(BUILDDIR)/x11/d_init.o : $(PROJECT_DIR)/standalone/d_init.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_modech.o : $(ROOT_DIR)/d_modech.c +$(BUILDDIR)/x11/d_modech.o : $(PROJECT_DIR)/standalone/d_modech.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_part.o : $(ROOT_DIR)/d_part.c +$(BUILDDIR)/x11/d_part.o : $(PROJECT_DIR)/standalone/d_part.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_polyse.o : $(ROOT_DIR)/d_polyse.c +$(BUILDDIR)/x11/d_polyse.o : $(PROJECT_DIR)/standalone/d_polyse.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_scan.o : $(ROOT_DIR)/d_scan.c +$(BUILDDIR)/x11/d_scan.o : $(PROJECT_DIR)/standalone/d_scan.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_sky.o : $(ROOT_DIR)/d_sky.c +$(BUILDDIR)/x11/d_sky.o : $(PROJECT_DIR)/standalone/d_sky.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_sprite.o : $(ROOT_DIR)/d_sprite.c +$(BUILDDIR)/x11/d_sprite.o : $(PROJECT_DIR)/standalone/d_sprite.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_surf.o : $(ROOT_DIR)/d_surf.c +$(BUILDDIR)/x11/d_surf.o : $(PROJECT_DIR)/standalone/d_surf.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_vars.o : $(ROOT_DIR)/d_vars.c +$(BUILDDIR)/x11/d_vars.o : $(PROJECT_DIR)/standalone/d_vars.c $(DO_X11_CC) -$(BUILDDIR)/x11/d_zpoint.o : $(ROOT_DIR)/d_zpoint.c +$(BUILDDIR)/x11/d_zpoint.o : $(PROJECT_DIR)/standalone/d_zpoint.c $(DO_X11_CC) -$(BUILDDIR)/x11/host.o : $(ROOT_DIR)/host.c +$(BUILDDIR)/x11/host.o : $(PROJECT_DIR)/standalone/host.c $(DO_X11_CC) -$(BUILDDIR)/x11/host_cmd.o : $(ROOT_DIR)/host_cmd.c +$(BUILDDIR)/x11/host_cmd.o : $(PROJECT_DIR)/standalone/host_cmd.c $(DO_X11_CC) -$(BUILDDIR)/x11/keys.o : $(ROOT_DIR)/keys.c +$(BUILDDIR)/x11/keys.o : $(PROJECT_DIR)/standalone/keys.c $(DO_X11_CC) -$(BUILDDIR)/x11/menu.o : $(ROOT_DIR)/menu.c +$(BUILDDIR)/x11/menu.o : $(PROJECT_DIR)/standalone/menu.c $(DO_X11_CC) -$(BUILDDIR)/x11/mathlib.o : $(ROOT_DIR)/mathlib.c +$(BUILDDIR)/x11/mathlib.o : $(PROJECT_DIR)/common/mathlib.c $(DO_X11_CC) -$(BUILDDIR)/x11/model.o : $(ROOT_DIR)/model.c +$(BUILDDIR)/x11/model.o : $(PROJECT_DIR)/standalone/model.c $(DO_X11_CC) -$(BUILDDIR)/x11/net_dgrm.o : $(ROOT_DIR)/net_dgrm.c +$(BUILDDIR)/x11/net_dgrm.o : $(PROJECT_DIR)/standalone/net_dgrm.c $(DO_X11_CC) -$(BUILDDIR)/x11/net_loop.o : $(ROOT_DIR)/net_loop.c +$(BUILDDIR)/x11/net_loop.o : $(PROJECT_DIR)/standalone/net_loop.c $(DO_X11_CC) -$(BUILDDIR)/x11/net_main.o : $(ROOT_DIR)/net_main.c +$(BUILDDIR)/x11/net_main.o : $(PROJECT_DIR)/standalone/net_main.c $(DO_X11_CC) -$(BUILDDIR)/x11/net_vcr.o : $(ROOT_DIR)/net_vcr.c +$(BUILDDIR)/x11/net_vcr.o : $(PROJECT_DIR)/standalone/net_vcr.c $(DO_X11_CC) -$(BUILDDIR)/x11/net_udp.o : $(ROOT_DIR)/net_udp.c +$(BUILDDIR)/x11/net_udp.o : $(PROJECT_DIR)/standalone/net_udp.c $(DO_X11_CC) -$(BUILDDIR)/x11/net_bsd.o : $(ROOT_DIR)/net_bsd.c +$(BUILDDIR)/x11/net_bsd.o : $(PROJECT_DIR)/standalone/net_bsd.c $(DO_X11_CC) -$(BUILDDIR)/x11/nonintel.o : $(ROOT_DIR)/nonintel.c +$(BUILDDIR)/x11/nonintel.o : $(PROJECT_DIR)/standalone/nonintel.c $(DO_X11_CC) -$(BUILDDIR)/x11/pr_cmds.o : $(ROOT_DIR)/pr_cmds.c +$(BUILDDIR)/x11/pr_cmds.o : $(PROJECT_DIR)/standalone/pr_cmds.c $(DO_X11_CC) -$(BUILDDIR)/x11/pr_edict.o : $(ROOT_DIR)/pr_edict.c +$(BUILDDIR)/x11/pr_edict.o : $(PROJECT_DIR)/standalone/pr_edict.c $(DO_X11_CC) -$(BUILDDIR)/x11/pr_exec.o : $(ROOT_DIR)/pr_exec.c +$(BUILDDIR)/x11/pr_exec.o : $(PROJECT_DIR)/standalone/pr_exec.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_aclip.o : $(ROOT_DIR)/r_aclip.c +$(BUILDDIR)/x11/r_aclip.o : $(PROJECT_DIR)/standalone/r_aclip.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_alias.o : $(ROOT_DIR)/r_alias.c +$(BUILDDIR)/x11/r_alias.o : $(PROJECT_DIR)/standalone/r_alias.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_bsp.o : $(ROOT_DIR)/r_bsp.c +$(BUILDDIR)/x11/r_bsp.o : $(PROJECT_DIR)/standalone/r_bsp.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_light.o : $(ROOT_DIR)/r_light.c +$(BUILDDIR)/x11/r_light.o : $(PROJECT_DIR)/standalone/r_light.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_draw.o : $(ROOT_DIR)/r_draw.c +$(BUILDDIR)/x11/r_draw.o : $(PROJECT_DIR)/standalone/r_draw.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_efrag.o : $(ROOT_DIR)/r_efrag.c +$(BUILDDIR)/x11/r_efrag.o : $(PROJECT_DIR)/standalone/r_efrag.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_edge.o : $(ROOT_DIR)/r_edge.c +$(BUILDDIR)/x11/r_edge.o : $(PROJECT_DIR)/standalone/r_edge.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_misc.o : $(ROOT_DIR)/r_misc.c +$(BUILDDIR)/x11/r_misc.o : $(PROJECT_DIR)/standalone/r_misc.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_main.o : $(ROOT_DIR)/r_main.c +$(BUILDDIR)/x11/r_main.o : $(PROJECT_DIR)/standalone/r_main.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_sky.o : $(ROOT_DIR)/r_sky.c +$(BUILDDIR)/x11/r_sky.o : $(PROJECT_DIR)/standalone/r_sky.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_sprite.o : $(ROOT_DIR)/r_sprite.c +$(BUILDDIR)/x11/r_sprite.o : $(PROJECT_DIR)/standalone/r_sprite.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_surf.o : $(ROOT_DIR)/r_surf.c +$(BUILDDIR)/x11/r_surf.o : $(PROJECT_DIR)/standalone/r_surf.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_part.o : $(ROOT_DIR)/r_part.c +$(BUILDDIR)/x11/r_part.o : $(PROJECT_DIR)/standalone/r_part.c $(DO_X11_CC) -$(BUILDDIR)/x11/r_vars.o : $(ROOT_DIR)/r_vars.c +$(BUILDDIR)/x11/r_vars.o : $(PROJECT_DIR)/standalone/r_vars.c $(DO_X11_CC) -$(BUILDDIR)/x11/screen.o : $(ROOT_DIR)/screen.c +$(BUILDDIR)/x11/screen.o : $(PROJECT_DIR)/standalone/screen.c $(DO_X11_CC) -$(BUILDDIR)/x11/sbar.o : $(ROOT_DIR)/sbar.c +$(BUILDDIR)/x11/sbar.o : $(PROJECT_DIR)/standalone/sbar.c $(DO_X11_CC) -$(BUILDDIR)/x11/sv_main.o : $(ROOT_DIR)/sv_main.c +$(BUILDDIR)/x11/sv_main.o : $(PROJECT_DIR)/standalone/sv_main.c $(DO_X11_CC) -$(BUILDDIR)/x11/sv_phys.o : $(ROOT_DIR)/sv_phys.c +$(BUILDDIR)/x11/sv_phys.o : $(PROJECT_DIR)/standalone/sv_phys.c $(DO_X11_CC) -$(BUILDDIR)/x11/sv_move.o : $(ROOT_DIR)/sv_move.c +$(BUILDDIR)/x11/sv_move.o : $(PROJECT_DIR)/standalone/sv_move.c $(DO_X11_CC) -$(BUILDDIR)/x11/sv_user.o : $(ROOT_DIR)/sv_user.c +$(BUILDDIR)/x11/sv_user.o : $(PROJECT_DIR)/standalone/sv_user.c $(DO_X11_CC) -$(BUILDDIR)/x11/zone.o : $(ROOT_DIR)/zone.c +$(BUILDDIR)/x11/zone.o : $(PROJECT_DIR)/common/zone.c $(DO_X11_CC) -$(BUILDDIR)/x11/view.o : $(ROOT_DIR)/view.c +$(BUILDDIR)/x11/view.o : $(PROJECT_DIR)/standalone/view.c $(DO_X11_CC) -$(BUILDDIR)/x11/wad.o : $(ROOT_DIR)/wad.c +$(BUILDDIR)/x11/wad.o : $(PROJECT_DIR)/common/wad.c $(DO_X11_CC) -$(BUILDDIR)/x11/world.o : $(ROOT_DIR)/world.c +$(BUILDDIR)/x11/world.o : $(PROJECT_DIR)/standalone/world.c $(DO_X11_CC) -$(BUILDDIR)/x11/cd_linux.o : $(ROOT_DIR)/cd_linux.c +$(BUILDDIR)/x11/cd_linux.o : $(PROJECT_DIR)/common/cd_linux.c $(DO_X11_CC) -$(BUILDDIR)/x11/sys_linux.o :$(ROOT_DIR)/sys_linux.c +$(BUILDDIR)/x11/sys_linux.o :$(PROJECT_DIR)/standalone/sys_linux.c $(DO_X11_CC) -$(BUILDDIR)/x11/vid_x.o: $(ROOT_DIR)/vid_x.c +$(BUILDDIR)/x11/vid_x.o: $(PROJECT_DIR)/common/vid_x.c $(DO_O_CC) -$(BUILDDIR)/x11/snd_dma.o : $(ROOT_DIR)/snd_dma.c +$(BUILDDIR)/x11/snd_dma.o : $(PROJECT_DIR)/common/snd_dma.c $(DO_X11_CC) -$(BUILDDIR)/x11/snd_mem.o : $(ROOT_DIR)/snd_mem.c +$(BUILDDIR)/x11/snd_mem.o : $(PROJECT_DIR)/common/snd_mem.c $(DO_X11_CC) -$(BUILDDIR)/x11/snd_mix.o : $(ROOT_DIR)/snd_mix.c +$(BUILDDIR)/x11/snd_mix.o : $(PROJECT_DIR)/common/snd_mix.c $(DO_X11_CC) -$(BUILDDIR)/x11/snd_linux.o :$(ROOT_DIR)/snd_linux.c +$(BUILDDIR)/x11/snd_linux.o :$(PROJECT_DIR)/common/snd_linux.c $(DO_X11_CC) ##### -$(BUILDDIR)/x11/d_copy.o : $(ROOT_DIR)/d_copy.s +$(BUILDDIR)/x11/d_copy.o : $(PROJECT_DIR)/standalone/d_copy.s $(DO_AS) -$(BUILDDIR)/x11/d_draw.o : $(ROOT_DIR)/d_draw.s +$(BUILDDIR)/x11/d_draw.o : $(PROJECT_DIR)/standalone/d_draw.s $(DO_AS) -$(BUILDDIR)/x11/d_draw16.o : $(ROOT_DIR)/d_draw16.s +$(BUILDDIR)/x11/d_draw16.o : $(PROJECT_DIR)/standalone/d_draw16.s $(DO_AS) -$(BUILDDIR)/x11/d_parta.o : $(ROOT_DIR)/d_parta.s +$(BUILDDIR)/x11/d_parta.o : $(PROJECT_DIR)/standalone/d_parta.s $(DO_AS) -$(BUILDDIR)/x11/d_polysa.o : $(ROOT_DIR)/d_polysa.s +$(BUILDDIR)/x11/d_polysa.o : $(PROJECT_DIR)/standalone/d_polysa.s $(DO_AS) -$(BUILDDIR)/x11/d_scana.o : $(ROOT_DIR)/d_scana.s +$(BUILDDIR)/x11/d_scana.o : $(PROJECT_DIR)/standalone/d_scana.s $(DO_AS) -$(BUILDDIR)/x11/d_spr8.o : $(ROOT_DIR)/d_spr8.s +$(BUILDDIR)/x11/d_spr8.o : $(PROJECT_DIR)/standalone/d_spr8.s $(DO_AS) -$(BUILDDIR)/x11/d_varsa.o : $(ROOT_DIR)/d_varsa.s +$(BUILDDIR)/x11/d_varsa.o : $(PROJECT_DIR)/standalone/d_varsa.s $(DO_AS) -$(BUILDDIR)/x11/math.o : $(ROOT_DIR)/math.s +$(BUILDDIR)/x11/math.o : $(PROJECT_DIR)/common/math.s $(DO_AS) -$(BUILDDIR)/x11/r_aliasa.o : $(ROOT_DIR)/r_aliasa.s +$(BUILDDIR)/x11/r_aliasa.o : $(PROJECT_DIR)/standalone/r_aliasa.s $(DO_AS) -$(BUILDDIR)/x11/r_drawa.o : $(ROOT_DIR)/r_drawa.s +$(BUILDDIR)/x11/r_drawa.o : $(PROJECT_DIR)/standalone/r_drawa.s $(DO_AS) -$(BUILDDIR)/x11/r_edgea.o : $(ROOT_DIR)/r_edgea.s +$(BUILDDIR)/x11/r_edgea.o : $(PROJECT_DIR)/standalone/r_edgea.s $(DO_AS) -$(BUILDDIR)/x11/r_varsa.o : $(ROOT_DIR)/r_varsa.s +$(BUILDDIR)/x11/r_varsa.o : $(PROJECT_DIR)/standalone/r_varsa.s $(DO_AS) -$(BUILDDIR)/x11/surf16.o : $(ROOT_DIR)/surf16.s +$(BUILDDIR)/x11/surf16.o : $(PROJECT_DIR)/standalone/surf16.s $(DO_AS) -$(BUILDDIR)/x11/surf8.o : $(ROOT_DIR)/surf8.s +$(BUILDDIR)/x11/surf8.o : $(PROJECT_DIR)/standalone/surf8.s $(DO_AS) -$(BUILDDIR)/x11/worlda.o : $(ROOT_DIR)/worlda.s +$(BUILDDIR)/x11/worlda.o : $(PROJECT_DIR)/standalone/worlda.s $(DO_AS) -$(BUILDDIR)/x11/r_aclipa.o : $(ROOT_DIR)/r_aclipa.s +$(BUILDDIR)/x11/r_aclipa.o : $(PROJECT_DIR)/standalone/r_aclipa.s $(DO_AS) -$(BUILDDIR)/x11/snd_mixa.o : $(ROOT_DIR)/snd_mixa.s +$(BUILDDIR)/x11/snd_mixa.o : $(PROJECT_DIR)/common/snd_mixa.s $(DO_AS) -$(BUILDDIR)/x11/sys_dosa.o : $(ROOT_DIR)/sys_dosa.s +$(BUILDDIR)/x11/sys_dosa.o : $(PROJECT_DIR)/standalone/sys_dosa.s $(DO_AS) ############################################################################# @@ -918,180 +926,180 @@ $(BUILDDIR)/bin/glquake : $(GLQUAKE_OBJS) $(GLX_OBJS) $(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLX_OBJS) $(GL_LDFLAGS) $(SVGA_LDFLAGS) $(LDFLAGS) $(BUILDDIR)/bin/glquake.3dfx : $(GLQUAKE_OBJS) $(GLSVGA_OBJS) - $(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLSVGA_OBJS) $(GL_LDFLAGS) $(LDFLAGS) + $(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(GLSVGA_OBJS) $(GLIDE_LDFLAGS) $(LDFLAGS) -$(BUILDDIR)/glquake/cl_demo.o : $(ROOT_DIR)/cl_demo.c +$(BUILDDIR)/glquake/cl_demo.o : $(PROJECT_DIR)/standalone/cl_demo.c $(DO_GL_CC) -$(BUILDDIR)/glquake/cl_input.o : $(ROOT_DIR)/cl_input.c +$(BUILDDIR)/glquake/cl_input.o : $(PROJECT_DIR)/standalone/cl_input.c $(DO_GL_CC) -$(BUILDDIR)/glquake/cl_main.o : $(ROOT_DIR)/cl_main.c +$(BUILDDIR)/glquake/cl_main.o : $(PROJECT_DIR)/standalone/cl_main.c $(DO_GL_CC) -$(BUILDDIR)/glquake/cl_parse.o : $(ROOT_DIR)/cl_parse.c +$(BUILDDIR)/glquake/cl_parse.o : $(PROJECT_DIR)/standalone/cl_parse.c $(DO_GL_CC) -$(BUILDDIR)/glquake/cl_tent.o : $(ROOT_DIR)/cl_tent.c +$(BUILDDIR)/glquake/cl_tent.o : $(PROJECT_DIR)/standalone/cl_tent.c $(DO_GL_CC) -$(BUILDDIR)/glquake/chase.o : $(ROOT_DIR)/chase.c +$(BUILDDIR)/glquake/chase.o : $(PROJECT_DIR)/standalone/chase.c $(DO_GL_CC) -$(BUILDDIR)/glquake/cmd.o : $(ROOT_DIR)/cmd.c +$(BUILDDIR)/glquake/cmd.o : $(PROJECT_DIR)/standalone/cmd.c $(DO_GL_CC) -$(BUILDDIR)/glquake/common.o : $(ROOT_DIR)/common.c +$(BUILDDIR)/glquake/common.o : $(PROJECT_DIR)/standalone/common.c $(DO_GL_DEBUG_CC) -$(BUILDDIR)/glquake/console.o : $(ROOT_DIR)/console.c +$(BUILDDIR)/glquake/console.o : $(PROJECT_DIR)/standalone/console.c $(DO_GL_CC) -$(BUILDDIR)/glquake/crc.o : $(ROOT_DIR)/crc.c +$(BUILDDIR)/glquake/crc.o : $(PROJECT_DIR)/standalone/crc.c $(DO_GL_CC) -$(BUILDDIR)/glquake/cvar.o : $(ROOT_DIR)/cvar.c +$(BUILDDIR)/glquake/cvar.o : $(PROJECT_DIR)/standalone/cvar.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_draw.o : $(ROOT_DIR)/gl_draw.c +$(BUILDDIR)/glquake/gl_draw.o : $(PROJECT_DIR)/standalone/gl_draw.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_mesh.o : $(ROOT_DIR)/gl_mesh.c +$(BUILDDIR)/glquake/gl_mesh.o : $(PROJECT_DIR)/standalone/gl_mesh.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_model.o : $(ROOT_DIR)/gl_model.c +$(BUILDDIR)/glquake/gl_model.o : $(PROJECT_DIR)/standalone/gl_model.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_refrag.o : $(ROOT_DIR)/gl_refrag.c +$(BUILDDIR)/glquake/gl_refrag.o : $(PROJECT_DIR)/standalone/gl_refrag.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_rlight.o : $(ROOT_DIR)/gl_rlight.c +$(BUILDDIR)/glquake/gl_rlight.o : $(PROJECT_DIR)/standalone/gl_rlight.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_rmain.o : $(ROOT_DIR)/gl_rmain.c +$(BUILDDIR)/glquake/gl_rmain.o : $(PROJECT_DIR)/standalone/gl_rmain.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_rmisc.o : $(ROOT_DIR)/gl_rmisc.c +$(BUILDDIR)/glquake/gl_rmisc.o : $(PROJECT_DIR)/standalone/gl_rmisc.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_rsurf.o : $(ROOT_DIR)/gl_rsurf.c +$(BUILDDIR)/glquake/gl_rsurf.o : $(PROJECT_DIR)/standalone/gl_rsurf.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_screen.o : $(ROOT_DIR)/gl_screen.c +$(BUILDDIR)/glquake/gl_screen.o : $(PROJECT_DIR)/standalone/gl_screen.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_test.o : $(ROOT_DIR)/gl_test.c +$(BUILDDIR)/glquake/gl_test.o : $(PROJECT_DIR)/standalone/gl_test.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_vidlinux.o : $(ROOT_DIR)/gl_vidlinux.c +$(BUILDDIR)/glquake/gl_vidlinux.o : $(PROJECT_DIR)/standalone/gl_vidlinux.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_vidlinuxglx.o : $(ROOT_DIR)/gl_vidlinuxglx.c +$(BUILDDIR)/glquake/gl_vidlinuxglx.o : $(PROJECT_DIR)/common/gl_vidlinuxglx.c $(DO_GL_CC) -$(BUILDDIR)/glquake/gl_warp.o : $(ROOT_DIR)/gl_warp.c +$(BUILDDIR)/glquake/gl_warp.o : $(PROJECT_DIR)/standalone/gl_warp.c $(DO_GL_CC) -$(BUILDDIR)/glquake/host.o : $(ROOT_DIR)/host.c +$(BUILDDIR)/glquake/host.o : $(PROJECT_DIR)/standalone/host.c $(DO_GL_CC) -$(BUILDDIR)/glquake/host_cmd.o : $(ROOT_DIR)/host_cmd.c +$(BUILDDIR)/glquake/host_cmd.o : $(PROJECT_DIR)/standalone/host_cmd.c $(DO_GL_CC) -$(BUILDDIR)/glquake/keys.o : $(ROOT_DIR)/keys.c +$(BUILDDIR)/glquake/keys.o : $(PROJECT_DIR)/standalone/keys.c $(DO_GL_CC) -$(BUILDDIR)/glquake/menu.o : $(ROOT_DIR)/menu.c +$(BUILDDIR)/glquake/menu.o : $(PROJECT_DIR)/standalone/menu.c $(DO_GL_CC) -$(BUILDDIR)/glquake/mathlib.o : $(ROOT_DIR)/mathlib.c +$(BUILDDIR)/glquake/mathlib.o : $(PROJECT_DIR)/common/mathlib.c $(DO_GL_CC) -$(BUILDDIR)/glquake/net_dgrm.o : $(ROOT_DIR)/net_dgrm.c +$(BUILDDIR)/glquake/net_dgrm.o : $(PROJECT_DIR)/standalone/net_dgrm.c $(DO_GL_CC) -$(BUILDDIR)/glquake/net_loop.o : $(ROOT_DIR)/net_loop.c +$(BUILDDIR)/glquake/net_loop.o : $(PROJECT_DIR)/standalone/net_loop.c $(DO_GL_CC) -$(BUILDDIR)/glquake/net_main.o : $(ROOT_DIR)/net_main.c +$(BUILDDIR)/glquake/net_main.o : $(PROJECT_DIR)/standalone/net_main.c $(DO_GL_CC) -$(BUILDDIR)/glquake/net_vcr.o : $(ROOT_DIR)/net_vcr.c +$(BUILDDIR)/glquake/net_vcr.o : $(PROJECT_DIR)/standalone/net_vcr.c $(DO_GL_CC) -$(BUILDDIR)/glquake/net_udp.o : $(ROOT_DIR)/net_udp.c +$(BUILDDIR)/glquake/net_udp.o : $(PROJECT_DIR)/standalone/net_udp.c $(DO_GL_CC) -$(BUILDDIR)/glquake/net_bsd.o : $(ROOT_DIR)/net_bsd.c +$(BUILDDIR)/glquake/net_bsd.o : $(PROJECT_DIR)/standalone/net_bsd.c $(DO_GL_CC) -$(BUILDDIR)/glquake/pr_cmds.o : $(ROOT_DIR)/pr_cmds.c +$(BUILDDIR)/glquake/pr_cmds.o : $(PROJECT_DIR)/standalone/pr_cmds.c $(DO_GL_CC) -$(BUILDDIR)/glquake/pr_edict.o : $(ROOT_DIR)/pr_edict.c +$(BUILDDIR)/glquake/pr_edict.o : $(PROJECT_DIR)/standalone/pr_edict.c $(DO_GL_CC) -$(BUILDDIR)/glquake/pr_exec.o : $(ROOT_DIR)/pr_exec.c +$(BUILDDIR)/glquake/pr_exec.o : $(PROJECT_DIR)/standalone/pr_exec.c $(DO_GL_CC) -$(BUILDDIR)/glquake/r_part.o : $(ROOT_DIR)/r_part.c +$(BUILDDIR)/glquake/r_part.o : $(PROJECT_DIR)/standalone/r_part.c $(DO_GL_CC) -$(BUILDDIR)/glquake/sbar.o : $(ROOT_DIR)/sbar.c +$(BUILDDIR)/glquake/sbar.o : $(PROJECT_DIR)/standalone/sbar.c $(DO_GL_CC) -$(BUILDDIR)/glquake/sv_main.o : $(ROOT_DIR)/sv_main.c +$(BUILDDIR)/glquake/sv_main.o : $(PROJECT_DIR)/standalone/sv_main.c $(DO_GL_CC) -$(BUILDDIR)/glquake/sv_phys.o : $(ROOT_DIR)/sv_phys.c +$(BUILDDIR)/glquake/sv_phys.o : $(PROJECT_DIR)/standalone/sv_phys.c $(DO_GL_CC) -$(BUILDDIR)/glquake/sv_move.o : $(ROOT_DIR)/sv_move.c +$(BUILDDIR)/glquake/sv_move.o : $(PROJECT_DIR)/standalone/sv_move.c $(DO_GL_CC) -$(BUILDDIR)/glquake/sv_user.o : $(ROOT_DIR)/sv_user.c +$(BUILDDIR)/glquake/sv_user.o : $(PROJECT_DIR)/standalone/sv_user.c $(DO_GL_CC) -$(BUILDDIR)/glquake/zone.o : $(ROOT_DIR)/zone.c +$(BUILDDIR)/glquake/zone.o : $(PROJECT_DIR)/common/zone.c $(DO_GL_CC) -$(BUILDDIR)/glquake/view.o : $(ROOT_DIR)/view.c +$(BUILDDIR)/glquake/view.o : $(PROJECT_DIR)/standalone/view.c $(DO_GL_CC) -$(BUILDDIR)/glquake/wad.o : $(ROOT_DIR)/wad.c +$(BUILDDIR)/glquake/wad.o : $(PROJECT_DIR)/common/wad.c $(DO_GL_CC) -$(BUILDDIR)/glquake/world.o : $(ROOT_DIR)/world.c +$(BUILDDIR)/glquake/world.o : $(PROJECT_DIR)/standalone/world.c $(DO_GL_CC) -$(BUILDDIR)/glquake/cd_linux.o : $(ROOT_DIR)/cd_linux.c +$(BUILDDIR)/glquake/cd_linux.o : $(PROJECT_DIR)/common/cd_linux.c $(DO_GL_CC) -$(BUILDDIR)/glquake/sys_linux.o : $(ROOT_DIR)/sys_linux.c +$(BUILDDIR)/glquake/sys_linux.o : $(PROJECT_DIR)/standalone/sys_linux.c $(DO_GL_CC) -$(BUILDDIR)/glquake/snd_dma.o : $(ROOT_DIR)/snd_dma.c +$(BUILDDIR)/glquake/snd_dma.o : $(PROJECT_DIR)/common/snd_dma.c $(DO_GL_CC) -$(BUILDDIR)/glquake/snd_mem.o : $(ROOT_DIR)/snd_mem.c +$(BUILDDIR)/glquake/snd_mem.o : $(PROJECT_DIR)/common/snd_mem.c $(DO_GL_CC) -$(BUILDDIR)/glquake/snd_mix.o : $(ROOT_DIR)/snd_mix.c +$(BUILDDIR)/glquake/snd_mix.o : $(PROJECT_DIR)/common/snd_mix.c $(DO_GL_CC) -$(BUILDDIR)/glquake/snd_linux.o : $(ROOT_DIR)/snd_linux.c +$(BUILDDIR)/glquake/snd_linux.o : $(PROJECT_DIR)/common/snd_linux.c $(DO_GL_CC) -$(BUILDDIR)/glquake/math.o : $(ROOT_DIR)/math.s +$(BUILDDIR)/glquake/math.o : $(PROJECT_DIR)/common/math.s $(DO_GL_AS) -$(BUILDDIR)/glquake/worlda.o : $(ROOT_DIR)/worlda.s +$(BUILDDIR)/glquake/worlda.o : $(PROJECT_DIR)/standalone/worlda.s $(DO_GL_AS) -$(BUILDDIR)/glquake/snd_mixa.o : $(ROOT_DIR)/snd_mixa.s +$(BUILDDIR)/glquake/snd_mixa.o : $(PROJECT_DIR)/common/snd_mixa.s $(DO_GL_AS) -$(BUILDDIR)/glquake/sys_dosa.o : $(ROOT_DIR)/sys_dosa.s +$(BUILDDIR)/glquake/sys_dosa.o : $(PROJECT_DIR)/standalone/sys_dosa.s $(DO_GL_AS) ############################################################################# diff --git a/standalone/cl_parse.c b/standalone/cl_parse.c index c79ca47..d9e8cf1 100644 --- a/standalone/cl_parse.c +++ b/standalone/cl_parse.c @@ -419,7 +419,7 @@ if (bits&(1<baseline.skin; + skin = ent->baseline.skinnum; if (skin != ent->skinnum) { ent->skinnum = skin; if (num > 0 && num <= cl.maxclients) @@ -431,7 +431,7 @@ if (bits&(1<skinnum = MSG_ReadByte(); else - ent->skinnum = ent->baseline.skin; + ent->skinnum = ent->baseline.skinnum; #endif if (bits & U_EFFECTS) @@ -495,7 +495,7 @@ void CL_ParseBaseline (entity_t *ent) ent->baseline.modelindex = MSG_ReadByte (); ent->baseline.frame = MSG_ReadByte (); ent->baseline.colormap = MSG_ReadByte(); - ent->baseline.skin = MSG_ReadByte(); + ent->baseline.skinnum = MSG_ReadByte(); for (i=0 ; i<3 ; i++) { ent->baseline.origin[i] = MSG_ReadCoord (); @@ -681,7 +681,7 @@ void CL_ParseStatic (void) ent->model = cl.model_precache[ent->baseline.modelindex]; ent->frame = ent->baseline.frame; ent->colormap = vid.colormap; - ent->skinnum = ent->baseline.skin; + ent->skinnum = ent->baseline.skinnum; ent->effects = ent->baseline.effects; VectorCopy (ent->baseline.origin, ent->origin); diff --git a/standalone/draw.c b/standalone/draw.c index 00ee0b4..98ad72f 100644 --- a/standalone/draw.c +++ b/standalone/draw.c @@ -549,17 +549,17 @@ void Draw_ConsoleBackground (int lines) // hack the version number directly into the pic #ifdef _WIN32 - sprintf (ver, "(WinQuake) %4.2f", (float)VERSION); + sprintf (ver, "QuakeForge (%4.2f) (WinQuake)", (float)VERSION); dest = conback->data + 320*186 + 320 - 11 - 8*strlen(ver); #elif defined(X11) - sprintf (ver, "(X11 Quake %2.2f) %4.2f", (float)X11_VERSION, (float)VERSION); + sprintf (ver, "QuakeForge (%4.2f) (X11 Quake)", (float)VERSION); dest = conback->data + 320*186 + 320 - 11 - 8*strlen(ver); #elif defined(__linux__) - sprintf (ver, "(Linux Quake %2.2f) %4.2f", (float)LINUX_VERSION, (float)VERSION); + sprintf (ver, "QuakeForge (%4.2f) (Linux Quake)", (float)VERSION); dest = conback->data + 320*186 + 320 - 11 - 8*strlen(ver); #else dest = conback->data + 320 - 43 + 320*186; - sprintf (ver, "%4.2f", VERSION); + sprintf (ver, "QuakeForge (%4.2f)", VERSION); #endif for (x=0 ; xdata + 320*186 + 320 - 11 - 8*strlen(ver); y = strlen(ver); diff --git a/standalone/include/client.h b/standalone/include/client.h index 7c59ee9..8fc0d13 100644 --- a/standalone/include/client.h +++ b/standalone/include/client.h @@ -147,34 +147,34 @@ extern client_static_t cls; // typedef struct { - int movemessages; // since connecting to this server - // throw out the first couple, so the player - // doesn't accidentally do something the - // first frame - usercmd_t cmd; // last command sent to the server + int movemessages; // since connecting to this server + // throw out the first couple, so the player + // doesn't accidentally do something the + // first frame + usercmd_t cmd; // last command sent to the server // information for local display int stats[MAX_CL_STATS]; // health, etc int items; // inventory bit flags - float item_gettime[32]; // cl.time of aquiring item, for blinking - float faceanimtime; // use anim frame if cl.time < this + float item_gettime[32];// cl.time of aquiring item, for blinking + float faceanimtime; // use anim frame if cl.time < this - cshift_t cshifts[NUM_CSHIFTS]; // color shifts for damage, powerups - cshift_t prev_cshifts[NUM_CSHIFTS]; // and content types + cshift_t cshifts[NUM_CSHIFTS]; // color shifts for damage, powerups + cshift_t prev_cshifts[NUM_CSHIFTS]; // and content types // the client maintains its own idea of view angles, which are // sent to the server each frame. The server sets punchangle when // the view is temporarliy offset, and an angle reset commands at the start // of each level and after teleporting. - vec3_t mviewangles[2]; // during demo playback viewangles is lerped - // between these - vec3_t viewangles; + vec3_t mviewangles[2]; // during demo playback viewangles is lerped + // between these + vec3_t viewangles; - vec3_t mvelocity[2]; // update by server, used for lean+bob - // (0 is newest) - vec3_t velocity; // lerped between mvelocity[0] and [1] + vec3_t mvelocity[2]; // update by server, used for lean+bob + // (0 is newest) + vec3_t velocity; // lerped between mvelocity[0] and [1] - vec3_t punchangle; // temporary offset + vec3_t punchangle; // temporary offset // pitch drifting vars float idealpitch; @@ -184,24 +184,24 @@ typedef struct double laststop; float viewheight; - float crouch; // local amount for smoothing stepups + float crouch; // local amount for smoothing stepups - qboolean paused; // send over by server + qboolean paused; // send over by server qboolean onground; qboolean inwater; - int intermission; // don't change view angle, full screen, etc - int completed_time; // latched at intermission start + int intermission; // don't change view angle, full screen, etc + int completed_time; // latched at intermission start - double mtime[2]; // the timestamp of last two messages - double time; // clients view of time, should be between - // servertime and oldservertime to generate - // a lerp point for other data - double oldtime; // previous cl.time, time-oldtime is used - // to decay light values and smooth step ups + double mtime[2]; // the timestamp of last two messages + double time; // clients view of time, should be between + // servertime and oldservertime to generate + // a lerp point for other data + double oldtime; // previous cl.time, time-oldtime is used + // to decay light values and smooth step ups - float last_received_message; // (realtime) for net trouble icon + float last_received_message; // (realtime) for net trouble icon // // information that is static for the entire time connected to a server @@ -210,15 +210,15 @@ typedef struct struct sfx_s *sound_precache[MAX_SOUNDS]; char levelname[40]; // for display on solo scoreboard - int viewentity; // cl_entitites[cl.viewentity] = player - int maxclients; - int gametype; + int viewentity; // cl_entitites[cl.viewentity] = player + int maxclients; + int gametype; // refresh related state struct model_s *worldmodel; // cl_entitites[0].model struct efrag_s *free_efrags; - int num_entities; // held in cl_entities array - int num_statics; // held in cl_staticentities array + int num_entities; // held in cl_entities array + int num_statics; // held in cl_staticentities array entity_t viewent; // the gun model int cdtrack, looptrack; // cd audio diff --git a/standalone/include/quakedef.h b/standalone/include/quakedef.h index e451827..b3d11a2 100644 --- a/standalone/include/quakedef.h +++ b/standalone/include/quakedef.h @@ -19,46 +19,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // quakedef.h -- primary header for client -//#define GLTEST // experimental stuff -#define QUAKE_GAME // as opposed to utilities - -#define VERSION 1.09 -#define GLQUAKE_VERSION 1.00 -#define D3DQUAKE_VERSION 0.01 -#define WINQUAKE_VERSION 0.996 -#define LINUX_VERSION 1.30 -#define X11_VERSION 1.10 - -//define PARANOID // speed sapping error checking - -#ifdef QUAKE2 #define GAMENAME "id1" // directory to look in by default -#else -#define GAMENAME "id1" -#endif - -#include -#include -#include -#include -#include -#include #if defined(_WIN32) && !defined(WINDED) - #if defined(_M_IX86) #define __i386__ 1 #endif - -void VID_LockBuffer (void); -void VID_UnlockBuffer (void); - -#else - -#define VID_LockBuffer() -#define VID_UnlockBuffer() - #endif #if defined __i386__ // && !defined __sun__ @@ -209,13 +176,8 @@ void VID_UnlockBuffer (void); // Use for multiplayer testing only - VERY dangerous!!! // #define IDGODS -#include "common.h" -#include "bspfile.h" -#include "vid.h" -#include "sys.h" -#include "zone.h" -#include "mathlib.h" +/* typedef struct { vec3_t origin; @@ -223,99 +185,20 @@ typedef struct int modelindex; int frame; int colormap; - int skin; + int skinnum; int effects; } entity_state_t; +*/ +#include -#include "wad.h" -#include "draw.h" -#include "cvar.h" -#include "screen.h" -#include "net.h" -#include "protocol.h" -#include "cmd.h" -#include "sbar.h" -#include "sound.h" -#include "render.h" -#include "client.h" #include "progs.h" #include "server.h" -#ifdef GLQUAKE -#include "gl_model.h" -#else -#include "model.h" -#include "d_iface.h" -#endif - -#include "input.h" #include "world.h" -#include "keys.h" -#include "console.h" -#include "view.h" -#include "menu.h" -#include "crc.h" -#include "cdaudio.h" - -#ifdef GLQUAKE -#include "glquake.h" -#endif - -//============================================================================= - -// the host system specifies the base of the directory tree, the -// command line parms passed to the program, and the amount of memory -// available for the program to use - -typedef struct -{ - char *basedir; - char *cachedir; // for development over ISDN lines - int argc; - char **argv; - void *membase; - int memsize; -} quakeparms_t; - - -//============================================================================= - - - -extern qboolean noclip_anglehack; - - -// -// host -// -extern quakeparms_t host_parms; - -extern cvar_t sys_ticrate; -extern cvar_t sys_nostdout; -extern cvar_t developer; - -extern qboolean host_initialized; // true if into command execution -extern double host_frametime; -extern byte *host_basepal; -extern byte *host_colormap; -extern int host_framecount; // incremented every frame, never reset -extern double realtime; // not bounded in any way, changed at - // start of every frame, never reset void Host_ClearMemory (void); -void Host_ServerFrame (void); -void Host_InitCommands (void); -void Host_Init (quakeparms_t *parms); -void Host_Shutdown(void); -void Host_Error (char *error, ...); -void Host_EndGame (char *message, ...); -void Host_Frame (float time); -void Host_Quit_f (void); -void Host_ClientCommands (char *fmt, ...); -void Host_ShutdownServer (qboolean crash); -extern qboolean msg_suppress_1; // suppresses resolution and cache size console output // an fullscreen DIB focus gain/loss extern int current_skill; // skill level for currently loaded level (in case // the user changes the cvar while the level is diff --git a/standalone/include/view.h b/standalone/include/view.h deleted file mode 100644 index 82123a1..0000000 --- a/standalone/include/view.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright (C) 1996-1997 Id Software, Inc. - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ -// view.h - -extern cvar_t v_gamma; - -extern byte gammatable[256]; // palette is sent through this -extern byte ramps[3][256]; -extern float v_blend[4]; - -extern cvar_t lcd_x; - - -void V_Init (void); -void V_RenderView (void); -float V_CalcRoll (vec3_t angles, vec3_t velocity); -void V_UpdatePalette (void); - diff --git a/standalone/sv_main.c b/standalone/sv_main.c index deda690..acca2b8 100644 --- a/standalone/sv_main.c +++ b/standalone/sv_main.c @@ -493,7 +493,7 @@ void SV_WriteEntitiesToClient (edict_t *clent, sizebuf_t *msg) if (ent->baseline.colormap != ent->v.colormap) bits |= U_COLORMAP; - if (ent->baseline.skin != ent->v.skin) + if (ent->baseline.skinnum != ent->v.skin) bits |= U_SKIN; if (ent->baseline.frame != ent->v.frame) @@ -943,7 +943,7 @@ void SV_CreateBaseline (void) VectorCopy (svent->v.origin, svent->baseline.origin); VectorCopy (svent->v.angles, svent->baseline.angles); svent->baseline.frame = svent->v.frame; - svent->baseline.skin = svent->v.skin; + svent->baseline.skinnum = svent->v.skin; if (entnum > 0 && entnum <= svs.maxclients) { svent->baseline.colormap = entnum; @@ -965,7 +965,7 @@ void SV_CreateBaseline (void) MSG_WriteByte (&sv.signon, svent->baseline.modelindex); MSG_WriteByte (&sv.signon, svent->baseline.frame); MSG_WriteByte (&sv.signon, svent->baseline.colormap); - MSG_WriteByte (&sv.signon, svent->baseline.skin); + MSG_WriteByte (&sv.signon, svent->baseline.skinnum); for (i=0 ; i<3 ; i++) { MSG_WriteCoord(&sv.signon, svent->baseline.origin[i]); diff --git a/standalone/sys_linux.c b/standalone/sys_linux.c index 1e54d8b..ce3be1f 100644 --- a/standalone/sys_linux.c +++ b/standalone/sys_linux.c @@ -383,7 +383,7 @@ int main (int c, char **v) nostdout = 1; else { fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); - printf ("Linux Quake -- Version %0.3f\n", LINUX_VERSION); + printf ("QuakeForge (Linux Quake) -- Version %0.3f\n", VERSION); } oldtime = Sys_FloatTime () - 0.1;