Commit graph

354 commits

Author SHA1 Message Date
Joseph Carter
3ab3941c81 NQ's menu is gone too, menu.c is laying around till I add more info to the
TODO file, then it dies too.
2001-03-04 07:43:27 +00:00
Bill Currie
cf3629b3b3 merge in my progs work off the `taniwha' branch. This prigs us a few nice
thinks:
  o Full progs modularity
  o CSQC should now be just a matter of creating the builtin functions and
    loading the code.
  o total independence from progs globals, functions and entity field layouts
    on the conditoin that their definitions have not been stripped from the
    progs file.
  o optional (though currently forced on) type checking on access to progs
    entity fields from C
  o the progs engine is fully shared between nq and qw.
2001-03-04 06:30:30 +00:00
Bill Currie
4137fbabb5 nq seems to like the new progs setup (got to e2m2 in medium without problems) 2001-03-04 05:27:29 +00:00
Joseph Carter
fe26a1c565 This should not be here yet, reverting 2001-03-03 10:01:49 +00:00
Joseph Carter
c057c27d9a Menu has been killed completely from qw. It's dead. I doubt anybody will
even notice, given that QW's menu was crippled to the point that it was
completely useless anyway.
2001-03-03 09:42:35 +00:00
Bill Currie
8e52f7dc39 more nq fixes, not there yet 2001-03-03 09:09:39 +00:00
Bill Currie
baa5ce01a1 more independence cleanups and nq is closer to running 2001-03-03 08:59:55 +00:00
Bill Currie
6d6c34320f nq compiles with the new progs setup, but doesn't have a hope of running yet.
None of the globals etc structs are filled in and there will be a lot of type
errors in SVFIELD usage.
2001-03-03 08:31:58 +00:00
Joseph Carter
168d47402a Mostly whitespace, these files are now identical and COULD be merged, if
they weren't about to get a rewrite first.
2001-03-03 06:51:18 +00:00
Joseph Carter
1094e146da COM_SkipPath now uses strrchr, it's much more readable now. 2001-03-01 07:42:28 +00:00
Joseph Carter
b2a53d4b46 The download bar is now seperate from Con_DrawConsole. This is currently
not really for the best, but it will be soon.
2001-03-01 02:51:51 +00:00
Joseph Carter
9564680d58 NQ's console is now identical to QW's, except for QW's download bar, which
IMO doesn't belong there and will be moving.  Other things may be moving
too, but I'm still debating them.
2001-02-28 10:49:39 +00:00
Bill Currie
dfaf767890 libqfgamecode now builds. Now for the fun part: getting qw and nq to work using
the new setup.
2001-02-28 09:12:01 +00:00
Joseph Carter
0aa6110272 An evil (but temporary) hack. NQ has no concept of ca_active. This
should change to fix a few outstanding NQ bugs at some point, but in the
meantime it has been defined to be the same as ca_connected.  Yeah, that's
damned evil.  It's been clearly marked and WILL go away when not needed.
2001-02-28 08:53:17 +00:00
Bill Currie
9f2dacd2e1 re-think edict_t. this is going to massivly break things for a while, but
tough, progs should never have known about entity_state_t in the first place.
Nor should it have been mod spefic.
2001-02-28 01:59:31 +00:00
Bill Currie
e5543eb0a6 next step of the progs merge done. just need to sort out interdependencies,
fix PR_SetString, and a few other things.
2001-02-28 00:56:03 +00:00
Bill Currie
7e14a0fbf3 clean up RETURN_EDICT and RETURN_STRING definitions to be both easier to read
and more correct for aliasing (and int size dependence, too:).
2001-02-27 19:05:05 +00:00
Bill Currie
8f0272c04e fix some indent braindamage.
change OP[ABC] to E_OP[ABC] and add OP[ABC] as the non-cast version.
2001-02-27 05:37:35 +00:00
Bill Currie
2367b0dc5f initial work at bringing nq's progs code up-to-snuff with qw's. Doesn't work
yet :( nq segs due to either mangled strings or mangled functions, not sure
yet.
2001-02-26 20:52:14 +00:00
Bill Currie
95e5b5e4cf all -snd* params and environment checking have been removed from the sound
subsystem in favor of Cvars. These new cvars are:
 o  snd_device  defaults to "" which selects the default device of the system
    (eg, plug:0,0 for ALSA 0.9 or /dev/dsp for OSS)
 o  snd_rate    defaults to 0 which selects the system default rate.
 o  snd_bits    defaults to 0 which selects the system default bit depth.
 o  snd_stereo  defaults to 1 (0 is mono)
2001-02-26 17:12:13 +00:00
Bill Currie
1fce1ea12e run indent over all the .c files using qw's .indent.pro. The real reason for
this is I mistakenly did so while making some other changes (which I made sure
were NOT in the checkin:)
2001-02-26 06:48:02 +00:00
Ragnvald Maartmann-Moe IV
4723086242 More comment updates! Flee in terror! (Right into the maw of that shambler behind you!) 2001-02-24 08:38:47 +00:00
Bill Currie
df916ef2c7 fix up the support for -<game> 2001-02-24 06:38:01 +00:00
Bill Currie
2bfeed6820 looks like utils is more or less complete for now, except for some fixes in
nq for abyss etc (ie, the magical -<mod> args).
The interface to the message subsystem got a revamp and all the mods to the .c
files reflect this. currently a little ugly, but I plan on abstracting msg
further to clean it up and make it more oo.
2001-02-23 23:16:13 +00:00
Bill Currie
981d067000 merge qw's net_com.c and checksum.c (net_com.c was identitcle to nq's
checksum.c) and then move the resutlting checksum.c into libs/utils
ditching nq's. Due to net_com.c, qw's libqfnet.a will need to be deleted or
you will get duplicate symbol link errors. Also merge crc.[ch] and move
qfplits.[ch] to their final homes. Also, remove a slightly overzealous use
of "static" in qfplist.[ch].
2001-02-23 18:31:48 +00:00
Bill Currie
265680d2c2 snd_alsa_0_9.c now works on my cards. Hope it still works for Despair. 2001-02-23 06:36:19 +00:00
Ragnvald Maartmann-Moe IV
efad87a4b7 Fiend is getting full, but I force fed it some more typos anyways. 2001-02-23 05:44:57 +00:00
Bill Currie
7227f77fb6 as alsa 0.6 never came out, ditch it and add 0.9 support (thanks, Abramo) 2001-02-22 20:51:51 +00:00
Bill Currie
42e52a7093 %s/libutil.a/libqfutil.a/g due to name space clash found when linking SDL.
New naming convention, all libs will be libqf<subsys>.a (should we instead
use libQF<subsys>.a?). The .so libs, when we get to them, will have to be
sorted out then.
2001-02-22 16:53:15 +00:00
Bill Currie
7516666084 libutil.a is now used by both qw and nq 2001-02-22 08:12:13 +00:00
Bill Currie
9aa50a847c clean up the mess caused by attempting to merge cmd.[ch]. When taken further,
this might give us nice controlability of when cvars can be changed.
2001-02-22 04:46:59 +00:00
Bill Currie
be075686bf move the win32 includes to the top level using qw's stuff 2001-02-22 04:10:24 +00:00
Bill Currie
cff964427a remove redundant files 2001-02-22 04:00:09 +00:00
Joseph Carter
4537b2daaa GGI has been eradicated. It's broken and none of us use it, therefore
nobody's fixing it.  Given that without DGA it's not really much faster
than X11 anyway and the lack of a maintainer, it's deadwood.
2001-02-22 00:24:45 +00:00
Ragnvald Maartmann-Moe IV
c6da49206e More typos, spelling corrections, and case fixes fed to the nearest handy fiend. 2001-02-22 00:15:03 +00:00
Bill Currie
42ce5b1184 nq now plays demos nicely (call Key_Init_Cvars and Con_Init_Cvars) 2001-02-21 22:34:42 +00:00
Bill Currie
c9ab2f1e10 forgot about all the automake macros 2001-02-21 22:26:47 +00:00
Bill Currie
8fc799f81c we finally have a bin naming scheme acceptable by all :)
nq-*
nq-server
qw-client-*
qw-server
2001-02-21 22:22:32 +00:00
Bill Currie
c6a37b31a4 s/stricmp/strcasesmp/ 2001-02-21 22:03:25 +00:00
Bill Currie
10b8c5e8ad ok, nq compiles again 2001-02-21 21:44:57 +00:00
Jeff Teunissen
de96c6c3b8 Configure updates. QSG_VERSION has completed its change to
{QW,NQ}_QSG_VERSION, because NQ and QW support differing versions.
2001-02-21 21:38:07 +00:00
Bill Currie
95f6db7775 start merging stuff into libs/util and fix the concequences in nq. nq doesn't
build yet though (keys.c, *screen.c and *view.c) due to console fun.
2001-02-21 19:35:06 +00:00
Joseph Carter
9a47e3c92c A modification to the gun location hack code.. The QW HUD was supposed to
give you a little more screen real-estate.  It does, but you still have a
big gun blocking most of your screen in the center.  If you turned off the
HUD, you got more screen and less gun.  That now happens whenever the HUD
is displayed.

This is a temporary measure.  At a later point, the gun will always be at
the bottom of the view area regardless of fov.
2001-02-21 19:13:03 +00:00
Joseph Carter
23ed09f249 Slightly different gl_fires effect. taniwha may back this out if he hates
it, but I kinda like it.
2001-02-20 23:36:50 +00:00
Joseph Carter
c2cea45217 NEWSTYLE is gone, sortof. The Cvar defaults for NEWSTYLE are now just the
defaults in non-win32 targets.  BASEDIR/SKINBASE are gone and the Cvars
which use them in the code are just given the oldstyle defaults now.  Use
of "base" is gone.  It was a half-assed solution to a problem that doesn't
exist yet.  When it finally does exist, we'll fix it right.
2001-02-20 23:06:48 +00:00
Joseph Carter
9438b77fdf Removed old configure stuff, it's merged now 2001-02-20 22:58:46 +00:00
Joseph Carter
4dd9f74fc0 NQ defined CVAR_HEAP for user-created Cvars, did nothing with it though. 2001-02-20 16:15:43 +00:00
Joseph Carter
2ae91bbbc6 Finished cleaning out the unused Cvar flags. The only ones we actually
ever used were CVAR_NONE, CVAR_ARCHIVE, CVAR_USERINFO, CVAR_SERVERINFO,
CVAR_ROM, and CVAR_USER_CREATED.  I kept CVAR_NOTIFY and CVAR_LATCH as
well since the latter was supposed to actually be implemented at some
point and the former would make a useful debug feature.
2001-02-20 15:31:49 +00:00
Zephaniah E. Hull
a7b59259c1 New name scheme for generated bins.
cougar-(qw|nq)-cl-*
cougar-(qw|nq)-sv

If someone really wants to a S&R on cougar in configure.in and the two
Makefile.am files will change it to something else.
2001-02-20 13:46:04 +00:00
Joseph Carter
089fb150db CVAR_INIT was unused, we have always used CVAR_ROM for that. Removed the
cruft.
2001-02-20 11:25:46 +00:00
Bill Currie
c83f38d8bf bring Mercury's changes back in 2001-02-20 04:57:07 +00:00
Bill Currie
e3b7ab218e minor fixups 2001-02-20 03:51:04 +00:00
Zephaniah E. Hull
75618f96c9 Working on one common configure which lets nq and qw compile.
There, needs a little clean up though.
2001-02-20 03:10:06 +00:00
Bill Currie
87854e1a0c initial checkin of most recent newtree and nuq(?) source 2001-02-19 21:15:25 +00:00