Commit Graph

213 Commits

Author SHA1 Message Date
Bill Currie ce9580f237 sufflin' shufflin' shuflin'.. raaw-source
qw-client now links, but qw-server won't compile (yet)
2000-02-11 04:21:10 +00:00
Bill Currie de1e542ead merge qw_server/qwsvdef.h qw_server/server.h uquake/server.h into
common/server.h
world.c some compile time fixups
2000-02-11 01:42:15 +00:00
Bill Currie b10cc7fea4 forgot to remove this 2000-02-10 23:38:52 +00:00
Bill Currie 3585aab0eb merges:
qw_server/world.[ch] and uquake/world.[ch] into common/world.[ch]
	uquake/chasecam.c into common/cl_cam.c
move physics type defines from server.h to phys.h
2000-02-10 23:38:19 +00:00
Joseph Carter f79476c5ec Don't declare SV_Shutdown twice 2000-02-10 16:46:47 +00:00
Joseph Carter 252621a4cd *** empty log message *** 2000-02-10 16:29:11 +00:00
Bill Currie 7d7d5faa18 add cl_cam.c to eliminate another undefined sybol. Now all that's left is
prediction stuff.
2000-02-10 14:02:36 +00:00
Bill Currie fabe501768 the merge continues. qw_common/common.c and uquake/common.c have /finally/ been
merged with the command line args merged into common/qargs.c. Args rebuilding
in qargs.c should now be totally safe with no limits.
2000-02-10 13:49:39 +00:00
Jeff Teunissen 3f04be7021 Added prototype for SV_Shutdown to server.h 2000-02-10 10:43:22 +00:00
Joseph Carter 2425b04e3b Host_ShutdownServer -> SV_Shutdown 2000-02-10 09:43:27 +00:00
Bill Currie 866f2514d0 common/host.c:
put Host_GetConsoleCommands back
uquake/server.h:
	proto for SV_Frame
uquake/sv_main.c
	add SV_ClientPrintf SV_BroadcastPrintf SV_DropClient SV_Frame* from
	old host.c
2000-02-10 09:03:30 +00:00
Loring Holden aa720bf076 Small changes to compile (not link) under Solaris, AIX, & Irix 2000-02-10 06:18:57 +00:00
Bill Currie ccbb656250 more uquake link fixups 2000-02-10 06:03:16 +00:00
Joseph Carter dee1dd73ca -DGLQUAKE in UQ gone---who left that in there? (Probably me...) 2000-02-10 05:43:45 +00:00
Bill Currie 3e1912f471 Host_* merging 2000-02-10 05:41:46 +00:00
Bill Currie eef00e39f3 stopped some cvar and cmd clashes 2000-02-09 09:55:58 +00:00
Bill Currie 688d7d470a quick bandaid to stop uquake from segfaulting. 2000-02-09 07:30:45 +00:00
Bill Currie 1308793cce moved qw_common{bothdefs.h,pmove.h,pmove_simple.h} to common
merged qw_common/quakedef.h and uquake/quakedef.h into common/quakedef.h (sort
of, bits of bothdefs.h too)
common/cl_ents.c common/client.h uquake/screen.c uquake/sv_user.c:
	various fixups to cope with the merge.

UQ is still busted
2000-02-09 01:44:59 +00:00
Bill Currie 21416b0b94 qw_common/pmove.h:
add #include "net.h"
uquake/Makefile.in:
	put cl_ents.c back it. might as well make a commitment :)
merge qw_common/protocol.h and uquake/protocol.h into common/protocol.h
2000-02-08 22:25:15 +00:00
Bill Currie 7d5b301d80 common/quakeio.c:
support gzipped files
common/quakefs.c:
qw_client/cl_parse.c:
qw_server/sv_ccmds.c:
uquake/host_cmd.c:
uquake/menu.c:
	use "z" in mode flags when reading files
uquake/Makefile.in:
	take cl_ents.c out again (too much work atm to get it to compile)
2000-02-08 20:59:36 +00:00
Bill Currie 1983cf894b move cl_ents.c from qw_clent to common
uquake/Makefile.in:
	add cl_ents.c (doesn't work yet)
qw_client/gl_vidlinux_x11.c:
	not used, waste of bandwidth
2000-02-08 07:44:02 +00:00
Bill Currie a078544d38 Replaced every single fscking FILE and gzFile (except in quakeio.*) with QFile
and fixed up as many f* and gz* calls as gcc found (and, where sensible, grep)

Unfortuanatly, demos are broken again.
2000-02-08 07:23:09 +00:00
Bill Currie e67f3dc07a uquake now builds 2000-02-08 06:14:10 +00:00
Bill Currie edbb589045 merge qw_client/cl_main.c and uquake/cl_main.c into common/cl_main.c
For the rest, convert all refs to FILE and gzFile to QFile, and similar for
file functions (eg fprintf, fgets, fread, etc)
2000-02-08 05:06:58 +00:00
Joseph Carter 7633189c91 cl_tent.c is merged - uquake still has some issues but they're smaller now 2000-02-07 22:54:33 +00:00
Bill Currie 56c8badd2d merge qw_client/r_edge.c and uquake/r_edge.c into common/r_edge.c 2000-02-07 04:31:25 +00:00
Bill Currie ea4390157a merge qw_client/r_efrag.c and uquake/r_efrag.c into common/r_efrag.c 2000-02-07 04:18:27 +00:00
Joseph Carter e023ae7ffe qw-client and server work again, sound_lib builds, uquake doesn't 2000-02-07 03:49:50 +00:00
Joseph Carter 3c55b43e25 Committing my merges of client.h and net.h.. Got rid of snd_dma.c changes
made before, it breaks a few things but it needs to be committed so they
can be fixed..
2000-02-07 01:32:12 +00:00
Bill Currie 004003ccb0 merge qw_common/common.h and uquake/common.h into common/common.h 2000-02-07 00:43:02 +00:00
Bill Currie 4b77a46ca6 merged qw_client/cl_input.c and uquake/cl_input.c into common/cl_input.c 2000-02-07 00:12:21 +00:00
Marcus Sundberg 2cb28b8f01 Prevent division by zero in CalcFov(). 2000-02-05 16:03:37 +00:00
Marcus Sundberg 6403d62a28 Include qargs.h 2000-02-05 16:02:39 +00:00
Joseph Carter dc627d6b28 uquake has the beginning of netchan support, netchan.message works fine
now, the rest I don't know how much of it I can do without breaking the
protocol's compatibility.

client_state_t has moved back to client.h in qw_common and uquake.  Seems
like that's a step backward, but the way it was being used while common
was far worse!  This required massive reworking of headers and such.

Speaking of using cl (the global client_state_t) badly, the sound code did
exactly that.  Mercury should be shot for not fixing that when he did the
sound_lib.a stuff.  The fix illustrates what we need to start doing to the
code to make modularization possible.  I'll be sending a message to the
list about this shortly..
2000-02-04 13:40:04 +00:00
Joseph Carter 7e04ceced5 The pretty green/yellow/blue pixels that hang around after things like
biosuits, pents, and quads wear off are now gone.  Sort of.  They are
caused by places where two texture edges meet and there are little gaps
at the seams where nothing gets drawn.  This is also why noclip screws w/
the screen if you walk outside of the map in the GL targets.  We now draw
a backdrop whose color is set by r_clearcolor, ala software renderer.
2000-02-04 04:01:23 +00:00
Joseph Carter 2606dee353 how many times have you wished there was a -nodemos parameter to make the
demos at startup not happen in uquake?  Guess what?
2000-02-04 01:24:39 +00:00
Joseph Carter c0dc03a8ff Other minor changes for uquake, nothing visible 2000-02-03 20:27:25 +00:00
Joseph Carter 9c399a04e5 ixed he irst etter issing roblem 2000-02-03 12:46:08 +00:00
Joseph Carter cdee91b71f talk sound now happens in UQ again 2000-02-03 10:56:46 +00:00
Loring Holden f7f02c7b58 client.h: Allow build without zlib
net_dgrm.c: Get rid of warnings about unknown functions
sys_unix: function warnings, unused variable warning
net_udp.c: use socklen_t always (it is guaranteed to be defined)
2000-02-03 08:42:14 +00:00
Bill Currie 083021da12 no-asm patch from Darius 2000-02-03 02:34:26 +00:00
Bill Currie 64a5b117ab Demoes are working again (for uncopressed .dem files, anyway) 2000-02-03 01:49:11 +00:00
Bill Currie e9a2a3fab5 Add gzip support, add -Werror to gcc CFLAGS, clean up misc warnings.
NOTE: demos are broken for gzipped demo files (possibly normal ones too, not
yet tested).
2000-02-03 00:34:12 +00:00
Bill Currie 0d679d1648 qw_client/Makefile.in:
put the gl specific rules back in (some of us have GL in
	/usr/X11R6/include rather than /usr/local/include or /usr/include,
	nudge, nudge).
2000-01-30 09:36:45 +00:00
Joseph Carter 4f9ce178c1 Merc missed a few things, cleaned the makefiles up a little more 2000-01-30 00:36:41 +00:00
Loring Holden ff664f9b75 Makefile.in - conditionally run ranlib
sys_unix.c - copied Sys_DebugLog() from sys_linux.c
2000-01-29 23:24:16 +00:00
Zephaniah E. Hull 925344be77 uquake now works! All targets I can test!
I also merged console.[ch] while I was at it..
2000-01-29 18:46:26 +00:00
Bill Currie 5e4575222d do alsa (sound in general) lib support the Right Way (tm)
missed 3dfx for gl
2000-01-29 10:59:02 +00:00
Bill Currie 1c6834bf91 fixed up the #include's so it now compiles (cleanly) 2000-01-29 02:58:16 +00:00
Zephaniah E. Hull 63978c73c6 uquake compile updates.. 2000-01-28 01:03:09 +00:00