Commit graph

446 commits

Author SHA1 Message Date
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
e6c9e1e5cd I forgot to modify vid_x.c, quake-x11 works now :)
--
Eric Windisch
2000-01-09 20:13:23 +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
Loring Holden
7b8c992435 draw.h - define Draw_Crosshair() always
vid_sunx.c - If can't get big enough shared memory image, try to get a
non-shared image (this is more of a problem with 24-bit than 8-bit - should
add a -bpp command for the SW targets)

glquake.h - combined version of {uquake,qw_client}/glquake.h
2000-01-09 19:40:44 +00:00
Joseph Carter
cf393a1068 Commented a couple lines out of vid_sdl.c which seem not to be needed
anymore (and were preventing building of the SDL target..)
2000-01-09 17:59:59 +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
Joseph Carter
3dfe70f066 ARGH! Mesa doesn't work with gl_ztrick 1 anymore and neither does Utah
GLX, so it now defaults to 0 for the linux -gl target..
2000-01-09 12:08:39 +00:00
Nelson Rush
78f728731c added Ricardo Veguilla's patch (it was sooooo messed up had to hand add it)
i *hope* this works....

Here's the patch for fixing the _windowed_mouse cvar
on SDL binaries. Its now set by default to "0" to
match the default value in vid_x.c and
gl_vidlinuxglx.c.
2000-01-09 11:20:55 +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
Jeff Teunissen
e5baa7240c Added header defs to dga_check.h 2000-01-09 08:12:18 +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
Jeff Teunissen
e54b1c0f6c Repaired small screwup on my part in prototypes 2000-01-09 07:52:43 +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
Jeff Teunissen
e36fbe4d88 Added support for checking whether DGA/Vmode support is available at
runtime. These files are not used yet!
2000-01-09 07:50: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
Eric Windisch
0097989a6d Put CvarRegisterVariable(&vid_glx_mode) in the right spot, although it worked
before; now, it is organized :)
-- Eric Windisch
2000-01-09 06:52:34 +00:00
Marcus Sundberg
6a3e312d99 Fixed case values. 2000-01-09 06:45:17 +00:00
Eric Windisch
26c8db3327 Commented out Dga code in VID_ExtraOptionCmd() untill someone writes some that works :) 2000-01-09 06:14:30 +00:00
Eric Windisch
8450a21789 Hopefully, everything is somewhat working and everything compiles now.
Although i wouldn't be surprised if it doesn't :)
-- Eric Windisch
2000-01-09 06:10:20 +00:00
Marcus Sundberg
dc89973cae Cleaned up includes.
#undef HAS_DGA until DGA extension is being properly used.
Added dgamouse variable.
Changed options_items into VID_options_items.
Made it start at 0 instead of 13.
Removed DGA code in VID_ExtraOptionCmd(). It doesn't do what it's supposed
to do, and DGA is not the right way to do it.
2000-01-09 05:55:26 +00:00
Eric Windisch
8dec8b28ff Maybe gl_vidlinuxglx.c works now ? :)
if it doesn't sorry, if it does.. maybe everyone will get off my case ;)
-- Eric Windisch
2000-01-09 05:36:41 +00:00
Eric Windisch
8862780003 More bug fixes to gl_vidlinuxglx.c for fullscreen/windowed switching..
now requires XMESA and DGA to do fullscreen switching,
although it shouldn't need XMESA in the future if you have DGA.
(XMESA needs DGA as a fallback, or that would be a bug in itself)

--
Eric Windisch
2000-01-09 05:23:14 +00:00
Marcus Sundberg
e144f6ceee Changed options_menu to VID_options_menu.
Made it start at 0 instead of 13.
Added support for 800x600 resolution.
2000-01-09 05:09:16 +00:00
Marcus Sundberg
08c6bbd84b Changed options_items to VID_options_items.
Made it start at 0 instead of 13.
2000-01-09 05:07:43 +00:00
Marcus Sundberg
fa34d3a742 Added M_Print() and M_DrawCheckBox() prototypes. 2000-01-09 05:02:41 +00:00
Marcus Sundberg
e06585df17 Add max() and min() macros if not defined. 2000-01-09 04:57:15 +00:00
Marcus Sundberg
992788cca4 Cleaned up the ExtraOption code a bit. 2000-01-09 04:56:21 +00:00
Eric Windisch
310ab78850 Fixed stupid bug where it can go into dga but not out of it.. untested.
gl_vidlinuxglx.c
-- Eric Windisch
2000-01-09 04:33:26 +00:00
Eric Windisch
e430dcb260 If mesa fullscreen/window hack doesn't work, toggle dga.. (gl_vidlinuxglx.c)
--
Eric Windisch
2000-01-09 04:29:55 +00:00
Zephaniah E. Hull
a227f53163 Support for a few more keys, and more importantly real support for the
wheel!!!

Some more tweaks to the speed cheat prevention..
2000-01-09 04:22:57 +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
3b6b24ef51 Moved input code to in_svgalib.c.
Some cleanups.
2000-01-09 02:44:36 +00:00
Marcus Sundberg
1bf7ae178e Moved input code to in_svgalib.c.
Cleaned up includes and code.
2000-01-09 02:43:27 +00:00
Marcus Sundberg
5377871488 Input driver for svgalib, used by gl_vidlinux_3dfx.c and vid_svgalib.c. 2000-01-09 02:41:28 +00:00
Marcus Sundberg
a0c6d434ec Removed includes 2000-01-09 02:28:12 +00:00
Marcus Sundberg
532867283c Check for sys/io.h and asm/io.h 2000-01-09 02:18:10 +00:00
Marcus Sundberg
9bc4ef12af Call VID_Init() before IN_Init().
Removed ifdef __linux__
2000-01-09 02:14:48 +00:00
Marcus Sundberg
89263d5eca Call VID_Init() before IN_Init(). 2000-01-09 02:13:51 +00:00
Marcus Sundberg
06e87abc90 Avoid warnings about inline with gcc -pedantic 2000-01-09 02:12:25 +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
9a2146c1da Added a bit to vid_null.c to aid those making new targets. Nothing big. 2000-01-09 01:23:36 +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
Marcus Sundberg
a3ae628e5a Replaced don't with do not so emacs font-lock-mode works ;) 2000-01-08 23:27:17 +00:00