Commit graph

193 commits

Author SHA1 Message Date
Marcus Sundberg
9a1b2d7607 Added dga_check.c to quake-gl 2000-01-15 03:33:27 +00:00
Marcus Sundberg
c0b5b95349 Call VID_ExtraOptionCmd() with correct argument.
Removed some useless code.
2000-01-15 03:18:33 +00:00
Bill Currie
61bf2de3ef common/mdfour.c common/pr_edict.c common/pr_exec.c uquake/r_main.c:
various warning cleanups
configure.in:
	check for XShm before enabling X
2000-01-14 03:41:40 +00:00
Eric Windisch
e688febe63 The previous 2 commits were on the rendering of menu.c
This commit makes it functional :) Wierd bug where fullscreen switch
isn't working, must fix...
-- Eric Windisch
2000-01-09 20:34:01 +00:00
Eric Windisch
2021a48efc Menu system is a bit more modular now and we have a workaround the problem
with the 'holes', we are using a (local) variable and incrementing it by 8
instead of using static values.
--
Eric Windisch
2000-01-09 20:10:55 +00:00
Loring Holden
f1c9f11a2c Need to include draw.h so Draw_Crosshair() is defined 2000-01-09 19:44:46 +00:00
Loring Holden
131086c25c {uquake,qw_client}/glquake.h combined and moved to common 2000-01-09 19:42:33 +00:00
Marcus Sundberg
d815aa804e Revison 1.17 worked exactly as intended. Revison 1.20 was completely broken. Like I said - it needs a cleanup, but it works for now. 2000-01-09 14:09:14 +00:00
Eric Windisch
4775ee68af fix for menu.c, adamel didn't add a bug.. just some bad code defining the variable his equation was using. Everything should finally be ok (like i haven't said that before)
--
Eric Windisch
2000-01-09 08:19:30 +00:00
Eric Windisch
cfb408b863 Forgot to fix the bug i said i fixed of adamel's last commit that existed in menu.c 2000-01-09 07:57:16 +00:00
Eric Windisch
e29fc9165e Reimplimented evil #define in menu.c cuz it wasn't working otherwise :)
Fixed a bug that im still not sure why Adamel implimented, he had it assuming
that every target has 15 entries, when they don't.
--
Eric Windisch
2000-01-09 07:52:39 +00:00
Marcus Sundberg
57bd541a05 Added the video menu back. This really needs a big cleanup, but it works for now. 2000-01-09 07:25:15 +00:00
Eric Windisch
212367ad9a Changed some stuff in menu.c to remove someone's evil #define of
options_items, rather made options_items a static int and
changed 'static int local_options_items = 13' into
'#define local_options_items 13' (non-evil define ;)
-- eric windisch
2000-01-09 07:19:27 +00:00
Jeff Teunissen
5f62210608 Added @DGA_LIBS@ to OpenGL target builds 2000-01-09 07:15:41 +00:00
Marcus Sundberg
992788cca4 Cleaned up the ExtraOption code a bit. 2000-01-09 04:56:21 +00:00
Eric Windisch
a09bf9b081 Ok, removed all the #define's and everything should be working fine now.
notify me of any bugs :)
--
Eric Windisch
2000-01-09 03:03:42 +00:00
Marcus Sundberg
b6bb5c9190 Added in_svgalib.c to svga and 3dfx targets. 2000-01-09 02:45:58 +00:00
Marcus Sundberg
89263d5eca Call VID_Init() before IN_Init(). 2000-01-09 02:13:51 +00:00
Eric Windisch
8e4c3039d6 Bug fixes for the option menu code, it should compile now :)
You will not be able to select the new options until I fix that bug...
That bug should be fixed within a few minutes.
--
Eric Windisch
2000-01-09 01:53:54 +00:00
Marcus Sundberg
0d3e377a75 Fixed typo in previous commit. 2000-01-09 01:26:56 +00:00
Eric Windisch
c5b5abd9ee This is a big change.. I added two new functions that must be in every
target's video file.  These functions are VID_ExtraOptionDraw() and
VID_ExtraOptionCmd(int options_cursor).

These are to help modulize the option menu a bit, now all you have to do is
define #OPTIONS_ITEMS to one more then the number of items there are (this
is done in your target's vid*.c/gl_vid*.c file)

I also removed a bunch of #ifdefs, although a few #ifdef _WIN32's remain.
--
Eric Windisch
2000-01-09 01:11:44 +00:00
Marcus Sundberg
7df47c6fdb Replaced sprintf with snprintf. 2000-01-08 23:37:13 +00:00
Joseph Carter
8f503d8209 Reverted Neal's GL fullbright patch till we can actually fix it properly
after the release
2000-01-08 22:28:07 +00:00
Marcus Sundberg
219acb9ce1 Fixed install target 2000-01-08 21:35:03 +00:00
Zephaniah E. Hull
67f8201590 Applied patch from Roger Sen Montero <rogersm@tau.uab.es> to switch to
using vsnprintf/snprintf..
2000-01-08 13:55:33 +00:00
Bill Currie
ef18af2a9b common/sound.h:
added extern for soundtime. Don't really know wy it wasn't there in the
	first place.
qw_client/Makefile.in uquake/Makefile.in:
	make the alsa objects say the right thing: snd_dma.c and snd_alsa.c
common/snd_alsa.c:
	New file. makes things go.
2000-01-08 12:14:07 +00:00
Eric Windisch
edbdeb3989 A small cleanup of the option menu, makes it more modular so adding new
options will not be as messy as before.

It adds a windowed mouse for GLX, and with the -DXMESA compiler option
(not currently supported by the configure/makefile process) there is an
additional option for users of Mesa3d running the quake-gl client  which
will switch between windowed and fullscreen modes on the fly.

The windowed mouse option is now fixed for windows users and would also
work for software-x11 clients, but #ifdef X11 isn't working?
--
Eric Windisch
2000-01-08 06:29:40 +00:00
Nelson Rush
dfbfbb6711 readded a copyright notice that somehow got removed
added "Portions" statement to the copyright statement

Please note, if you want to put a copyright notice on a source file stating that a portion of it is copyright yourself or another author please put "Portions Copyright...", if adding a seperate .c file that contains otherwise author(s) this doesn't apply.
2000-01-08 04:50:26 +00:00
Nelson Rush
2151636145 added copyrights for buffer overrun fixes 2000-01-07 05:47:53 +00:00
Joseph Carter
ef8e59610a filter patch to remove \r and \n from people's names in the server 2000-01-07 05:02:38 +00:00
Marcus Sundberg
ab7585ffa2 Added DOS VGA stuff.
Added DOS and Windows network support.
2000-01-07 01:20:15 +00:00
Marcus Sundberg
18e36fb5d1 Don't name local variables errno. 2000-01-07 01:17:53 +00:00
Marcus Sundberg
a5a502ff97 Don't name local variable errno. 2000-01-07 01:17:05 +00:00
Nelson Rush
36a1b4d7ae added dan olson's patch
This patch keeps all the "PackFile" and "FindFile" messages from flooding
stdout unless the developer cvar is set to 1.
2000-01-06 22:02:55 +00:00
Marcus Sundberg
1c432eec0e Moved Sys_mkdir() to common/sys_common.c
!!! FIXME !!! Move Sys_DoubleTime() there too.
2000-01-06 18:38:40 +00:00
Marcus Sundberg
983243b577 Moved Sys_mkdir() and Sys_DoubleTime() into common/sys_common.c 2000-01-06 18:36:14 +00:00
Marcus Sundberg
3dc80e29b7 Moved Sys_FileTime() into common/sys_common.c 2000-01-06 17:46:47 +00:00
Marcus Sundberg
6e9074153f Moved Sys_Printf into common/sys_common.c 2000-01-06 16:56:38 +00:00
Marcus Sundberg
f816a6dbc1 This was identical to common/sys_dosa.s 2000-01-06 16:33:09 +00:00
Marcus Sundberg
58a561b806 Made MGL target compile again. 2000-01-06 03:13:04 +00:00
Marcus Sundberg
b28fa0a244 Add #ifndef so file is only included once. 2000-01-06 02:29:09 +00:00
Marcus Sundberg
a6460e7bdd Removed the bogus -DELF statements. 2000-01-06 01:06:17 +00:00
Marcus Sundberg
b86ca17101 Fixed bunch of unused variables. 2000-01-06 00:29:41 +00:00
Marcus Sundberg
9e5e83cc73 Added $(LIBS) to linker command lines. 2000-01-05 22:12:51 +00:00
Marcus Sundberg
04c438c55e Check return code from mmap() properly. 2000-01-05 21:22:48 +00:00
Joseph Carter
4ebf133971 Merged the makefile targets as much as is safe to do without a serious
code alteration.  Cut my build time from 20 minutes down to about 5 from
an autoconf-clean tree.
2000-01-05 19:10:52 +00:00
Zephaniah E. Hull
b68f84619e Fixes for portability issues.. 2000-01-05 16:55:01 +00:00
Zephaniah E. Hull
dbbeff44fc We now have fullbright textures for GL!
This is going in as a bug fix after talking it over with Knghtbrd and Deek..
2000-01-05 15:23:12 +00:00
Joseph Carter
c90b93d0b7 Cleaned the clean targets a bit 2000-01-05 12:09:29 +00:00
Marcus Sundberg
b2bd0774e0 Moved resource.h and conproc.h from uquake/do_not_include to uquake. 2000-01-05 01:41:36 +00:00
Marcus Sundberg
65094e2a35 _windowed_mouse needs to be declared. 2000-01-05 01:26:09 +00:00
Marcus Sundberg
048b8393f3 Reportedly the #undef sa_family is really needed on SGIs. 2000-01-05 01:14:30 +00:00
Nelson Rush
705c1d0e3b fixed some problems 2000-01-05 00:11:02 +00:00
Nelson Rush
a77bb35db6 Fixed buffer overflow problems, changed sprintf to snprintf don't use this yet, i have a few things that need to be fixed. 2000-01-05 00:05:48 +00:00
Marcus Sundberg
c5de0f10c5 Added MGL target (relax Palisade - it's only compiled on win32 ;)
Moved d_copy.s from SWREND_SRC_PLAT to SVGA_VID_SRC as the functions in
there are only used in vid_svgalib.c and vid_vga.c
2000-01-04 23:38:36 +00:00
Marcus Sundberg
26c0d830b2 Fix includes.
filelength() is unused and breaks compile on mingw32.
Copied Sys_FileOpenRead() and Sys_DoubleTime() from qw_client/sys_win.c
2000-01-04 23:36:31 +00:00
Marcus Sundberg
54f4335a8a Autoconf network headers. 2000-01-04 23:06:13 +00:00
Marcus Sundberg
0a99e0d5fe Include ctype.h for is*() functions.
Removed unused variables from InitConProc().
2000-01-04 23:02:02 +00:00
Marcus Sundberg
b8d1dd372a Added @NET_LIBS@ to LDFLAGS. 2000-01-04 22:59:57 +00:00
Marcus Sundberg
d576b7c9d1 Made building outside the sourcedir work again.
Made top of Makefile look like qw_client/Makefile.in
2000-01-04 21:29:10 +00:00
Joseph Carter
6c74e92dd2 No longer do the makefiles stat the obj dir for every compile! While I
experienced almost no visible benefit in terms of compile time, others
with older machines will and the makefiles are generally cleaner now.
2000-01-04 12:02:27 +00:00
Nelson Rush
5f20ff0bd7 added loring's multi-platform, non-mesa OpenGL patch. 2000-01-04 05:33:00 +00:00
Joseph Carter
740177b2c0 Another merge from BigM 2000-01-04 03:34:56 +00:00
Zephaniah E. Hull
6006adda7c Backported and merged the qw_client/keys.c to uquake.
Added support for the KP_* keysyms..
2000-01-04 01:53:31 +00:00
Joseph Carter
3e71009f2a uquake/crc.c is common 2000-01-04 01:05:52 +00:00
Joseph Carter
0b8df448c2 Major configure.in update, applied BigM's gl_rsurf.c merge patch 2000-01-04 01:03:18 +00:00
Jeff Teunissen
fbc21a8c5e * Merged d_polyse.c from qw_client, _unchanged_ -- current data suggest it
works properly with UQ.
* Repaired my FIXME in r_alias.c (caused UQ's software targets to segfault)
2000-01-03 23:27:17 +00:00
Joseph Carter
55a4e4e01c Fixed register_check(), renamed a couple of non-headers to the "standard"
naming of .-c, also the very beginnings of the eventual source reformat.
2000-01-03 21:54:18 +00:00
Jeff Teunissen
6337f34ba1 * Fixed an X11 software renderer crash in vid_x.c, thanks Justin A. McCright
* Renamed chase_* to cl_chasecam_* in UQ to match their parent cvar.
* Changed cl_chasecam* in UQ to be saved in config.cfg
* Moved dosasm.s to common, though it doesn't seem to be referenced at _all_
2000-01-03 21:20:01 +00:00
Jeff Teunissen
978ccb3cc8 Merged nonintel.c into common/ 2000-01-03 13:45:02 +00:00
Jeff Teunissen
71b8dc4cad Merged r_bsp.c into common/ 2000-01-03 13:35:09 +00:00
Jeff Teunissen
a671482dd5 sys_linux.c merged and moved into common/ 2000-01-03 12:12:13 +00:00
Jeff Teunissen
202f794fbe The merge continues...sys_null.c (Portability aid) is common. 2000-01-03 11:14:42 +00:00
Jeff Teunissen
518401c90c Simplified COM_Block*Checksum (don't worry, it's still compatible -- I
tested it), merged r_alias.c (note the FIXME at the end of r_alias.c)
2000-01-03 10:41:24 +00:00
Joseph Carter
5761d2f334 Moved -lm to global LDFLAGS, everything but the GL renderer needs it ajd
on at least some platforms the GL renderer needs it too.
2000-01-03 10:25:01 +00:00
Joseph Carter
95dc2c6ebf Heavy Makefile.in updates. Real install target, clean now removes bins,
and make is now a little smarter about knowing when to rerun ./configure
and ./bootstrap
2000-01-03 08:03:01 +00:00
Joseph Carter
68785812de More BSD fixes from Darius 2000-01-03 08:00:46 +00:00
Nelson Rush
a841b90d2d SDLQuake merge with our tree made possible by Sam Lantinga and Maas van den Berg, currently the video and cdrom audio are supported. 2000-01-03 06:18:32 +00:00
Joseph Carter
d0674e837c pandr's pr_* merge.. 2000-01-03 04:45:54 +00:00
Joseph Carter
d5217418ec QW's crosshair 2 and crosshaircolor now work in UQ. Also because I felt
like adding a gratuitious feature, GL target users can crosshair 3 for a
completely new crosshair and higher resolution crosshair (oooh!)  Software
renderer doesn't have it because...well look at Draw_Crosshair() in
draw.c, it's truly a nightmare!  You have to plot each pixel individually,
makes you feel like you're coding in Applesoft BASIC.  If you want it,
figure out how to do it sanely.
2000-01-03 04:33:43 +00:00
Joseph Carter
cfa702ec38 pr_comp.h's identical, moved to common 2000-01-03 02:24:26 +00:00
Zephaniah E. Hull
47e85cdd29 Version cleanup, not completely happy with it yet..
Removed the registered game checking, but added a little back for
backword compatibility..
2000-01-03 01:40:54 +00:00
Joseph Carter
590b4c1c58 crosshair 2 now works in UQ, as does crosshaircolor 2000-01-03 00:08:03 +00:00
Joseph Carter
8ee8699d16 Sound cleanups from Marcus: snd_linux.c -> snd_oss.c, the OSS API is used
on a lot more than just Linux.  Updated Autoconf to check for OSS rather
than check for Linux and just assume OSS is there.
2000-01-02 16:18:22 +00:00
Joseph Carter
6d9ae5f2ef Merged gl_draw.c! Yes, the version string is unscaled. 2000-01-02 15:53:47 +00:00
Joseph Carter
d7d4a3dcd6 Removed all traces of the useless gl_reporttjunctions cvar 2000-01-02 12:00:43 +00:00
Joseph Carter
9ef97ca84c Whoever put X11_CFLAGS = ... $(X_CFLAGS) in the Makefile.in's was smoking
something potent.  Should be @X_CFLAGS@, fixed.
2000-01-02 11:23:41 +00:00
Joseph Carter
365a1c144f draw.[ch] merge 2000-01-02 10:06:17 +00:00
Joseph Carter
247158c517 Marcus' GGI targets added, fear! 2000-01-02 08:50:13 +00:00
Joseph Carter
b75354555d chase_active in uquake is now cl_chasecam like in qw-client 2000-01-02 05:46:52 +00:00
Joseph Carter
4a291f544e fixed VERSION not getting defined/used properly hopefully once and for all 2000-01-02 05:34:27 +00:00
Joseph Carter
c7f95dda2d Removed _all_ references to the define IDGODS. It was turned off anyway,
but still a glaring security hole waiting for someone to abuse.
2000-01-02 05:00:54 +00:00
Eric Windisch
aaf2545ce2 Removed uquake/gl_rmisc.c and qw_client/gl_rmisc.c 2000-01-02 04:18:38 +00:00
Eric Windisch
797b93f871 Taniwha pointed out that qw didn't compile, i put cvar_t r_waterwarp in a non-common file. I moved it to r_glmain.c, everything _SHOULD_ work now (I hope!). 2000-01-02 04:04:17 +00:00
Eric Windisch
88058a06c6 I thank Mao for pointing out to me the bootscrap script (which runs autoheader and autoconf). I removed the #version from quakedef.h and changed the version to "0.1.0-pre" within acconfig.h 2000-01-02 03:56:55 +00:00
Eric Windisch
88bd46b4b6 Been commiting quite a lot tonight; I forgot to register r_fog and r_waterwarp
for qw_client.  r_volfog was forgotten for uquake and qw, whoops.
2000-01-02 03:40:10 +00:00
Eric Windisch
e7b423b68c Someone deleted #define VERSION, readded it.. uquake now compiles again.
Version reports as 0.1.0, the next planed unstable release.
2000-01-02 03:26:36 +00:00
Eric Windisch
2bfc08ccde Preliminary Volumetric fog :)
fixed problem where r_fog, r_waterwarp were not defined for quakeworld.
2000-01-02 03:12:59 +00:00
Joseph Carter
233d0af85f Added autoheader support. Also added ./bootstrap to go from a freshly
checked out tree to something ./configure'able.
2000-01-01 20:45:27 +00:00
Joseph Carter
a48be19a46 LDFLAGS cleanups for -svga and -3dfx 2000-01-01 16:12:25 +00:00