78a1e3e6bc
can't use Con_Printf at this stage
2000-02-20 06:18:33 +00:00
592b054f82
common/gl_vidglx.c:
...
some tweeks in an attempt to improve shutdown. NOT the final say
qw_server/sv_ccmds.c:
comment correction
common/quakefs.c uquake/host_cmd.c:
knghtbrd's gamedir patch, plus some Hunk_Alloc -> Z_Malloc changes.
2000-02-20 04:20:00 +00:00
d6143f645f
a few glx video cleanups
2000-02-19 20:54:58 +00:00
0cd791223c
Fixed a conwidth bug involving min(a,b). Whoever did this needs to be injured.
2000-02-19 20:43:34 +00:00
636b73cc11
Synced some code between UQ/QW.
2000-02-19 15:43:42 +00:00
fe555bd14e
Fixed broken #endif
2000-02-19 15:42:13 +00:00
be77f29ec8
Merged IN_Commands with IN_Frame.
2000-02-19 14:52:17 +00:00
9baa100ca8
Made code work again.
2000-02-19 14:30:51 +00:00
10cc5228c5
Remove redundant shared stuff from Makefiles.
2000-02-19 13:53:08 +00:00
aa605d7d51
fix a nastyness in shutdown code
2000-02-19 09:53:47 +00:00
1e9f882fee
Whoops, minor compile fixes..
2000-02-19 08:44:02 +00:00
0fae0e01d3
Reverting away from modules in the main branch..
...
-3dfx, -x11, and -glx all work, at least for qw-client, no promices on uquake.
I can't test any other targets at the moment, so....
2000-02-19 08:24:15 +00:00
1b7369d462
Makefile.in - let autoconf tell us how to do shared library stuff
...
cvar.c - added $include <stdlib.h>
in_x11.c - removed #include "menu.h" (unavailable in some cases & unneeded)
vid_sunx.c - now loads x11 plugin
world.c - only call SV_Error if compiling uquake or qw-server
2000-02-17 16:18:55 +00:00
7d387042f7
New CVAR flag system. Appears to work perfectly
2000-02-16 21:30:20 +00:00
f74c84e695
added a comment from Zoid describing how things like CVAR_ROM works
2000-02-16 04:36:33 +00:00
6656fb6af6
add the #defines Zoid posted to irc
2000-02-15 23:17:23 +00:00
1bf5d6c30c
Makefile.in: Removed -lvga from in_x11.so build
...
rest: misc. fixes
2000-02-15 19:25:09 +00:00
b03c0a094e
More menu stuff and input plugin loading for -glx targets
2000-02-15 18:45:26 +00:00
c878ab64f4
Prep of menus for video modularization.
2000-02-15 14:25:03 +00:00
b099c73cc4
add Cvar_Init, which adds the "set" command to create dynamic cvars
2000-02-15 11:42:12 +00:00
b099908cc7
fix a potential buffer overflow
2000-02-14 20:28:22 +00:00
9ed247178f
common/plugin.c:
...
add path searching. currently unix style only (ie ':') and defaults to
".:${LIBDIR}/quakeforge".
*/Makefile.in:
fix up the clean targets a little, so they actually work
2000-02-14 11:30:37 +00:00
7670da27cf
Now just pass the filename (not path) when loading the plugin. Currently
...
assumes path of ./ but taniwha was going to add a cvar which can be used
if va("./%s", filename) doesn't exist..
2000-02-14 09:02:16 +00:00
17a4f34644
Whitespace changes to the opening comment
2000-02-14 08:50:30 +00:00
173c556c0f
put TILE_SIZE back in (still needed by r_sky.c)
2000-02-14 06:15:09 +00:00
a2e5a8be6d
some mods on the way to a better plugin system
2000-02-14 04:46:57 +00:00
fdd6112d74
svgalib input works again.
2000-02-14 03:27:10 +00:00
6bd0f67f8c
Deleted unused/obsolete code related to my last commit.
2000-02-14 03:23:04 +00:00
17eb4d012c
Some changes to quakefs.c for the pakzip (formerly pak3) support.
...
Found and deleted unused, obsolete functions in r_surf.c
2000-02-14 03:08:14 +00:00
6d8a39b2dd
Pass just the filename to the plugin loader, no path. taniwha will do
...
some black voodoo (is that a plug for 3dfx?) with the plugin code shortly
to make it work..
2000-02-14 00:46:43 +00:00
f11f71d8a7
we now define LIBDIR when we build targets
2000-02-14 00:35:13 +00:00
bb5623aa9e
input.h is gone - was empty anyway. vid_x11.c now is responsible for init
...
of the input routines it can use. All vid targets should do this for the
input method they should use. While this is essentially hardcoding, it's
kinda necessary for now. Once we have everything working and tested we
can work on an interdependency scheme so X input methods only work with X
output methods, etc...
2000-02-13 11:31:00 +00:00
1d7260195f
Renamed vid_x.c -> vid_x11.c, also renamed *-gl to *-glx, it it'll cause
...
less confusion that way (even if I have to type an extra letter..)
2000-02-13 09:06:11 +00:00
9a2b4c0e5a
fix sound init
2000-02-13 05:45:38 +00:00
502d171cbf
turns out uquake can handle (build time anyway) qw's pmove*.c as is, so make
...
them common
2000-02-13 04:32:18 +00:00
3b1494b153
Fixed some little errors with the plugin code..
2000-02-12 11:42:56 +00:00
b0fba33d43
uquake /almost/ links now (is that link being sort of pregnant?)
2000-02-12 10:02:22 +00:00
84e7f8fb05
correct return type of S_IN_Init
2000-02-12 08:23:40 +00:00
dd7d064733
in_x11.so, and actually check in the plugin code..
...
vid_x works, aside from a few, err, qwirks, in the input focus handling..
2000-02-12 08:08:31 +00:00
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
0affdbf681
fixes for uquake
...
(ie #ifdef SERVERONLY -> #if defined(SERVERONLY) || defined(UQUAKE))
2000-02-12 04:18:42 +00:00
a2f8d0f212
Fixed "vvoid" and "oid" in server.h
2000-02-11 06:01:35 +00:00
149c6c6523
getting closer to haveing a compiling uq
2000-02-11 05:47:57 +00:00
e713452ba5
qw-server now compiles and links
2000-02-11 04:55:11 +00:00
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
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
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
c249d90a69
Slight reformat, nothing big
2000-02-10 17:25:27 +00:00
252621a4cd
*** empty log message ***
2000-02-10 16:29:11 +00:00
796976d7b8
AIX needs stdlib.h so malloc is defined
2000-02-10 16:24:10 +00:00
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
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
c4797f95fe
added some more missing cvars
2000-02-10 11:19:51 +00:00
2425b04e3b
Host_ShutdownServer -> SV_Shutdown
2000-02-10 09:43:27 +00:00
df559eaf9f
Under a rare case in UQ (that you are playing with the QW HUD in a co-op
...
game), the color bar that was supposed to be the backdrop for your frag
counts would be drawn as if the statusbar was centered (which is never
the case if you're using the HUD), fixed.
I have more sbar.c fixes to do but I need a working UQ to be able to test
them out first. We're _almost_ there... We all owe Deek and taniwha big
for the progress made tonight I think---great job guys. But save SOME of
the merge for the rest of us willya? ;>
2000-02-10 09:36:00 +00:00
f52457b0c7
moved many cvars in from the old host.c
2000-02-10 09:16:56 +00:00
e0987665d8
Possible fix to the recently-uncovered UQuake segfault.
2000-02-10 09:07:26 +00:00
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
74e0de143a
host.c completions...might be able to link now. :)
2000-02-10 08:45:53 +00:00
44ec4f61d5
A couple cl_ents functions removed from cl_main for uquake, we're close to
...
being able to link uquake again! Reformatted the top of cl_ents
2000-02-10 06:22:29 +00:00
aa720bf076
Small changes to compile (not link) under Solaris, AIX, & Irix
2000-02-10 06:18:57 +00:00
ccbb656250
more uquake link fixups
2000-02-10 06:03:16 +00:00
28088048b3
uquake now compiles, but doesn't link yet
2000-02-10 05:58:27 +00:00
1cd0078fca
qw now links
2000-02-10 05:45:53 +00:00
3e1912f471
Host_* merging
2000-02-10 05:41:46 +00:00
eef00e39f3
stopped some cvar and cmd clashes
2000-02-09 09:55:58 +00:00
16e636cc01
make independent of zlib (ie use HAS_ZLIB)
2000-02-09 09:12:55 +00:00
88bc2bf209
common/gl_refrag.c common/gl_rmain.c:
...
fix to compile with cl_visedicts from qw in uq
common/quakeio.c:
fix bogus string copying
2000-02-09 06:27:30 +00:00
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
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
0b3798abff
Fixing consequences of merge + new macro for IPV6
2000-02-08 21:23:46 +00:00
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
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
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
e67f3dc07a
uquake now builds
2000-02-08 06:14:10 +00:00
83fc2c0373
forgot to add these in the last checkin. They implement the QFile stuff.
2000-02-08 05:08:34 +00:00
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
bc28568890
there are still uquake issues...
2000-02-07 23:13:16 +00:00
7633189c91
cl_tent.c is merged - uquake still has some issues but they're smaller now
2000-02-07 22:54:33 +00:00
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
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
bcc96386cd
A few mods for uquake...
2000-02-07 04:18:18 +00:00
e023ae7ffe
qw-client and server work again, sound_lib builds, uquake doesn't
2000-02-07 03:49:50 +00:00
9a17811cd3
removed reference to cl_state.h
2000-02-07 03:21:08 +00:00
aceca3eb86
this shouldn't be in cvs
2000-02-07 01:53:45 +00:00
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
004003ccb0
merge qw_common/common.h and uquake/common.h into common/common.h
2000-02-07 00:43:02 +00:00
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
9ff456626f
snd_null.c - snd is another variable defined in snd_dma.c that has to be
...
defined here as well
vid_sunx.c - missing client.h include
2000-02-05 19:42:21 +00:00
840ff1c72f
Added support for numpad keys and some other ones missing.
2000-02-05 17:49:03 +00:00
662e6491eb
Make sure we don't use a negative index into sb_faces.
2000-02-05 16:01:15 +00:00
475353c278
typedef socklen_t here if it doesn't exist.
2000-02-05 15:59:39 +00:00
69cbd2e370
Now compiles.
2000-02-05 15:21:19 +00:00
461c66051c
Include <model.h>
2000-02-05 15:08:13 +00:00
0d77a4577e
Include <math.h>
2000-02-05 15:05:44 +00:00
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
233984564e
configure.in:
...
remove a debug echo
snd_alsa.c:
#include "console.h"
2000-02-04 09:52:43 +00:00
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
23b33b7173
4 scrap textures oughtta be enough for anybody.
2000-02-04 01:58:27 +00:00
0a46c1d979
configure.in:
...
make zlib enabled by default
common/nozip.h:
swap the size and count params to f{read,write} to prevent demo code
breaking
common/quakefs.c:
if zlib is unavailable, there is no point in supporting the .gz
extension
2000-02-03 21:44:46 +00:00
218d2fcb9b
random QW changes which should help with sbar stuff later on
2000-02-03 21:16:57 +00:00
9e47e221b6
Changed the name of the pak3 code to pakzip. Also a few assorted, trivial code cleanups.
...
-- Eric Windisch
2000-02-03 21:13:23 +00:00
c0dc03a8ff
Other minor changes for uquake, nothing visible
2000-02-03 20:27:25 +00:00
9c399a04e5
ixed he irst etter issing roblem
2000-02-03 12:46:08 +00:00
9a9384f6a9
Cmd_InitFilesystem(): add -game support to the common cmd.c, #ifdef
...
QUAKEWORLD the Cmd_AddGameDirectory("%s/qw", ... ) call.
2000-02-03 11:29:22 +00:00
18fc5af9e9
Replaced Knghtbrd's command fix for UQ, added more for completeness.
2000-02-03 11:14:57 +00:00
cdee91b71f
talk sound now happens in UQ again
2000-02-03 10:56:46 +00:00
e9e147fe84
Most of the commands in uquake/host_cmd.c are simply passed to the server
...
when you type them. This includes say, god, etc... They never got there
however because Mercury forgot to add the uquake stuff to it. We _REALLY_
need to get cls.netchan backported to uquake!
2000-02-03 10:51:06 +00:00
51676c32e7
You can tell who has what hardware and libs because they tend to forget to
...
update the files for the stuff they don't use/have...
2000-02-03 10:32:56 +00:00
afe3589124
Fix for 3dfx target using lsh's macros
2000-02-03 09:55:11 +00:00
8349f3e59f
Various changes to get build to work when zlib isn't available...
...
Various changes to get rid of warnings under AIX, Irix, Linux & Solaris...
2000-02-03 08:46:52 +00:00
75bb541f81
more f*->gz*. forgot to save this one earlier.
2000-02-03 03:09:52 +00:00
fe681d4427
some more f* -> gz*. need to get home to test this properly.
2000-02-03 02:59:11 +00:00
73c6ffdde3
a few more f* -> gz* conversions. I don't have GL at work :)
2000-02-03 02:52:05 +00:00
083021da12
no-asm patch from Darius
2000-02-03 02:34:26 +00:00
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
02dab8f828
Re-added Hipnotic/Rogue support to filesystem code. Cleaned up
...
COM_LoadGameDirectory().
2000-02-02 06:49:43 +00:00
7bc3e61e27
This isn't funny.. Typo fixed.
2000-02-02 05:33:23 +00:00
b210bffd3e
Note to self: ...test before you commit, test before you commit...
2000-02-02 05:10:56 +00:00
0393b88e5f
breaks are evil outside switch's, the for loop has an exit condition...
2000-02-02 05:07:29 +00:00
b1af7c3e37
Fixed bug that caused:
...
Error: Not enough RAM allocated. Try starting using "-mem 16" or higher
Quakefs.c
2000-02-02 05:01:07 +00:00
668fcd2143
Minor changes to quakefs.c; if generations and experimental are defined all files ending in .pak3 are loaded.
2000-02-01 05:13:30 +00:00
19e937518c
can find "wadfile".gz as well as just "wadfile". NOTE: .gz files don't acutally
...
work yet.
2000-01-30 22:46:30 +00:00
8346bd1997
aa tty support, adds text mode qf keyboard/video support.
...
currently i have no idea if this even works because i cannot test it, if anyone is willing to make a target for it i can start debugging.
2000-01-30 07:32:33 +00:00
4f9ce178c1
Merc missed a few things, cleaned the makefiles up a little more
2000-01-30 00:36:41 +00:00
3c8f2939af
Makefile.in - Explicitly list patterns instead of using echo, conditionally
...
run ranlib
d_part.c, snd_sun.c, vid_sunx.c - missing includes
2000-01-29 23:22:00 +00:00
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
b87a49e6ba
fixed the netchan stuff for uquake
2000-01-29 02:53:28 +00:00
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
ee26684664
fix to work with Mercury's header changes
2000-01-28 11:13:13 +00:00
25f297ded2
A little more work trying to get the tree back to normal..
2000-01-28 03:19:57 +00:00
63978c73c6
uquake compile updates..
2000-01-28 01:03:09 +00:00
b733915e6a
these should not be here (yet)
2000-01-27 22:56:15 +00:00
8298748791
more work on the merge
2000-01-27 19:27:33 +00:00
fdec8fa33a
Quick fixup for compiling without the gl headers..
2000-01-27 19:10:22 +00:00
bbec99182c
Added Makefile to .gitignore
2000-01-27 19:08:46 +00:00
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
d38c50700e
sbar now works exactly like it does in stable, HUD and all for both UQ and
...
for QW. sbar.c is STILL a mess and will continue to be such until I can
check at runtime for QW/UQ.. When that happens the merge can move MUCH
faster for everybody (so somebody do it! hehe)
2000-01-27 07:54:49 +00:00
335a822d3f
new files. not yet complete so the old ones have not been deleted.
2000-01-27 05:18:39 +00:00
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
7940ad28cd
Fixed waterwarp bug; athough entities no longer warp underwater.
...
for those interested, someone had added additional conditions which
waterwarp is applied that caused problems.
--
Eric Windisch
2000-01-26 18:15:18 +00:00
fb124072be
Adding unzip.h, note: unzip.h and unzip.c are directly copied from
...
aftershock. Several functions added to common.c were copied and
modified from aftershock as well. The rest of common.c's pak3 code (so far)
was written by me. All the standard disclaimers apply.
--
Eric W.
2000-01-26 04:22:33 +00:00
29d8ba0b55
Needed for pak3 support, btw. this uses Zlib so possibly not portable.
...
-- Eric Windisch
2000-01-26 02:08:47 +00:00
8e85621d15
A few of Mercury's local changes and things I've done to stable.. We're
...
attempting to get a build WITHOUT GL to work again...
2000-01-25 05:59:19 +00:00
56a753d763
Don't include menu.h if SERVERONLY is defined.
2000-01-24 00:10:39 +00:00
79a286c45b
A '&' before an array variable is at best ignored, at worst it could do weird stuff.
2000-01-24 00:09:59 +00:00
eae2220a78
Making things even more generic, and a fix for compiling without GL support.
2000-01-23 04:42:43 +00:00
620ccc3e84
Updates to assist in merging...
2000-01-23 03:52:06 +00:00
9be70be1b0
Preliminary (probably nonfunctional) support for QW's HUD in UQ. Beware!
2000-01-22 22:21:46 +00:00
595d38cb89
Removed for the second time. If there is a problem with sys_dosa.s and Win32 - fix it right.
2000-01-22 16:43:42 +00:00
Bill Currie
Joseph Carter
Dan Olson
Marcus Sundberg
Zephaniah E. Hull
Loring Holden
Jeff Teunissen
Eric Windisch
Pontus Lidman
Nelson Rush