Commit Graph

166 Commits

Author SHA1 Message Date
Zephaniah E. Hull 0e8ba8d814 Sledge hammer applied..
The input stuff is now somewhat modular, I'll get everything working
soon enough, right now things are hardwired to svgalib, but its ok..
2000-02-12 05:34:22 +00:00
Bill Currie e3d564905d put REQUIRED worlda.s back in. it will not cause probelms for non-x86 archs as
generates an empty .o file if id386 is 0 or undefined
2000-02-11 11:07:04 +00:00
Loring Holden 0442e797e4 Remove redundant worlda.s that caused problems on non-x86 systems 2000-02-11 06:50:15 +00:00
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 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
Bill Currie 314cca66b8 common/common.h:
add #include <cvar.h>
move qw_client/cl_cam.c to common/cl_cam.c
2000-02-10 13:56:47 +00:00
Bill Currie fa875465d7 add host.c 2000-02-10 05:29:45 +00:00
Pontus Lidman d608249a38 Added --enable-ipv6 option to configure to enable IPv6 networking.
It substitutes @NET_SOURCE@ for net_udp.c or net_udp6.c.
2000-02-08 21:23:06 +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 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 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 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
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 218d2fcb9b random QW changes which should help with sbar stuff later on 2000-02-03 21:16:57 +00:00
Loring Holden 713e84ecae Workaround for isspace() with sgi and gcc 2000-02-03 08:44:01 +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 3357d40344 Explicitly list patterns instead of using the following:
$(shell echo $(BUILD_DIR)/{client,common_lib}/%.d)

That does not work properly on various platforms (AIX, SGI, Solaris)
2000-01-29 23:18:26 +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
Jeff Teunissen ad90a0508d Added part of what we'll require for automatically generating dependency
information. This is not activated yet, and will be quite annoying at the
very least to activate before we are in a more traditional build tree,
with a single source directory and self-contained (except for headers, of
course) subdirs for modules.
2000-01-29 15:02:45 +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
Jeff Teunissen e489bb2b00 Makefile.in cleanups. Software targets are once again built before GL
targets. A few .o's changed to .@OBJEXT@, although most Unix-based systems
won't care about that. :)
2000-01-29 10:08:02 +00:00
Bill Currie 6f213c8342 common/quakefs.c:
make pak3 support dependent on /both/ _EXPERIMENTAL_ and GENERATIONS
qw_client/Makefile.in:
	move gl files into cleint/gl so thay can have their own build rules
	conditionally added -lasound to LIBS if building for ALSA
2000-01-29 02:31:47 +00:00
Joseph Carter 25f297ded2 A little more work trying to get the tree back to normal.. 2000-01-28 03:19:57 +00:00
Jeff Teunissen 6ccfe788c9 Removed unnecessary #include "glquake.h" 2000-01-27 19:05:44 +00:00
Zephaniah E. Hull 75731706a0 Whoops, included glquake.h instead of cvars.h.. 2000-01-27 17:28:49 +00:00
Zephaniah E. Hull f18b3bcf02 HUGE changes..
Basicly, sound_lib.a is built, and is compiled into the clients..
Note, uquake is SERIOUSLY FSCKED..
2000-01-27 17:06:02 +00:00
Loring Holden 88344ef21a glquake.h now included from only the files that use OpenGL, and not from
common_quakedef.h (and thus all files)

This solves a build break when the OpenGL includes are not in /usr/include,
since the OpenGL include path is only used when compiling files that use
OpenGL.
2000-01-26 19:00:36 +00:00
Jeff Teunissen 9be70be1b0 Preliminary (probably nonfunctional) support for QW's HUD in UQ. Beware! 2000-01-22 22:21:46 +00:00
Zephaniah E. Hull 427b74299d No more -DGLQUAKE!!!
Took me 9+ hours straight to do it, but its done!
2000-01-22 12:54:51 +00:00
Jeff Teunissen 35169e2b94 Merged r_main.c -- it wasn't the chore it looked like it was going to be.
It's still #ifdef'ed all over the place, but there are max. 100 lines that
aren't common.
2000-01-22 10:51:27 +00:00
Marcus Sundberg c156232c95 Link the *-gl binaries with @DYN_LIBS@. 2000-01-19 01:24:41 +00:00
Marcus Sundberg 7f6a114dd9 Removed bogus checks on unused variable. 2000-01-18 22:41:06 +00:00
Zephaniah E. Hull 0391657e6b We now have two versions, what we first identify ourselves as, which is
2.40, and the quakeforge version, fixes the annoying spectator bug..
2000-01-16 12:19:30 +00:00
Marcus Sundberg 0206281103 Changed gl_vidlinuxglx.c to gl_vidglx.c as it really doesn't have anything
with Linux to do.
2000-01-15 04:14:04 +00:00
Marcus Sundberg a3c55dc1cf Added dga_check.c to qw-client-gl 2000-01-15 03:33:10 +00:00
Marcus Sundberg 8f29fd21f1 Incorporated the VID_ExtraOption* stuff from uquake/menu.c 2000-01-15 03:31:37 +00:00
Marcus Sundberg a43852a7d7 Ops, should be tab instead of spaces... 2000-01-12 21:36:45 +00:00
Marcus Sundberg 95c0a50665 Added the not-so-useless ifneqs back - they prevents warnings from make 2000-01-12 21:18:44 +00:00
Marcus Sundberg 3866cc3771 Removed useless ifndefs.
Added rule for gl/dga_check.@OBJEXT@
2000-01-11 01:17:16 +00:00
Nelson Rush 7560771b16 beginnings of IPv6 support by Pontus Lidman
(pali) i had to personally fix this so that it's optional, if anyone wants to enable this (it's not ready yet, it's just a star) you have to uncomment the line\
for QW_NET_SRC in qw_client/Makefile.in and qw_server/Makefile.in, you also have to uncomment LINUX_IPV6 definition in qw_common/net.h

here's an excerpt of Pontus's explaination:
I've started to work on IPv6 support. I guess it's not a top priority, as
the intersections of quake players and people with 6bone access is pretty
small, but at least I'm one of them ;)

If anyone else is interested in working on IPv6 support, or have
opinions/advice on how to go about it, I'd like to get in touch.
2000-01-09 22:11:12 +00:00