Commit graph

335 commits

Author SHA1 Message Date
stevenaaus
329243bdb6 cd fix needed fo gameplay
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@292 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 01:28:40 +00:00
stevenaaus
b9544e4934 Make "cd play" progress tracks
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@291 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 00:35:22 +00:00
sezero
61ac767167 * cd_sdl.c (export_cddev_arg): make putevn() actually work.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@290 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 23:46:16 +00:00
sezero
1bcbee0f96 * cd_sdl.c (export_cddev_arg): fixed bad snprintf and the crash it was
causing.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@289 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 23:20:16 +00:00
sezero
030bbe5a3d cd_sdl.c: no need for uhexen2's CVS version identifier to stay here.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@288 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 17:23:39 +00:00
sezero
67e1f62305 * cd_sdl.c (get_cddev_arg): fix stupid typo in uppercasing.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@287 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 15:55:54 +00:00
sezero
b79ff5e9c2 * cd_sdl.c (get_cddev_arg): check for null or empty arguments also
for non-windows platforms.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@286 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 14:32:34 +00:00
sezero
9c06e7a75f * cd_sdl.c: Remove unnecessary SDL_getenv.h include.
(CDAudio_Init): Move the bad ugly hack about SDL_CDROM environment
variable into the new export_cddev_arg() helper. FOr the -cddev option,
call the new get_cddev_arg() helper.

(export_cddev_arg): SDL_CDROM environment variable hack moved from
CDAudio_Init() to here. Fixed bad strcat() usage orto the array. Made it
for non-windows platforms only.

(get_cddev_arg): Added for checking the argument to the -cddev option.
For non-windows platforms just return the argument itself. For windows,
arg should be like "D:\", make sure it is so, but tolerate args like "D"
or "D:", as well.

(CDAudio_Next): Make static. Minor cleanups.

(CDAudio_Prev): Make static. Minor cleanups.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@285 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 14:05:32 +00:00
stevenaaus
352681d0f5 cd command tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@284 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 10:31:00 +00:00
stevenaaus
c821878ca7 Add "cd next" and "cd prev" commands. Add a new "-cd" option , which in combination with "-dedicated", allows QS to be a stand-alone cd player... Useful\!
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@283 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 09:49:03 +00:00
stevenaaus
7622990e13 Set SDL_CDROM environment variable when using -cddev. Some doco updates.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@282 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 04:12:19 +00:00
sezero
e46ff4f5b6 MS Visual Studio support:
* Quake/console.c, net_udp.c: replace snprintf by q_snprintf.
* Quake/common.h: Define q_snprintf as _snprintf for windows and as
snprintf for all others. Likewise for q_vsnprintf. Disable several
MSVC warnings. Define fmin and fmax as min and max macros for MSVC.
* Windows/quakespasm.vcproj, quakespasm.sln: Add Visual Studio 2005
project files.
* Windows/SDL_x64.zip: Add SDL x64 import libraries for MSVC.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@281 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-20 02:25:22 +00:00
sezero
3e6760e6c5 Makefile.w32, Makefile.w64: made them a little bit more flexible by adding
CROSS_COMPILE and TARGET variables.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@280 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-17 19:30:35 +00:00
kristianduske
8931642fac OS X launcher now uses -fullscreen argument to switch into fullscreen mode instead of just omitting the -windowed argument.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@279 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 22:31:28 +00:00
sezero
2808f8893b pr_cmds.c (PF_traceline): Added a FIXME note about the NaN issue with certain progs.dat
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@278 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 21:02:31 +00:00
sezero
b800f8ff69 added q_stdinc.h, adapted from uhexen2, to tidy up several includes and
macros in one place.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@277 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:55:39 +00:00
sezero
102fb41b74 pr_cmds.c (PF_traceline): fix entity number printing.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@276 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:50:31 +00:00
sezero
088d07a753 mathlib.h, mathlib.c: changed nanmask from being a global to being
a macro.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@275 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:10:20 +00:00
sezero
9998315606 * pr_cmd.c: replaced isnan() calls with quake's own ISNAN() macro.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@274 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:06:06 +00:00
sezero
1ee99859d1 added note that the "homedir" patch here is outdated
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@273 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 19:44:58 +00:00
kristianduske
81c61116c5 git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@272 af15c1b1-3010-417e-b628-4374ebc0bcbd 2010-08-14 19:41:09 +00:00
stevenaaus
09e39cc3f0 README tweaks
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@271 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 11:59:39 +00:00
stevenaaus
1dca306415 README changes
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@270 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 07:40:48 +00:00
stevenaaus
96d68f5b7f Miscellaneous doco updates
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@269 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 05:01:12 +00:00
stevenaaus
2eeced7210 PF_traceline causes program to die badly if given non-numeric (isnan) vectors. So we must check to not allow this happening. Additionally, stop program execution is developer cvar is set. Note: Compiling program with gcc option \'-ffast-math\' (and more specifically, -funsafe-math-optimizations) is an alternative fix than this patch. It performs FPU opts that gloss over the issue
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@268 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 03:59:29 +00:00
stevenaaus
fd2bf27771 Swap left and right arrow keys in the videomode menu. (Right arrow now increases resolution, which is more standard)
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@267 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 03:42:52 +00:00
kristianduske
9dcf5ed4d2 Changed base SDK to 10.4.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@266 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-13 12:05:26 +00:00
kristianduske
984bc6efde Mac OS X launcher can be suppressed by passing "-nolauncher" on the command line.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@265 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-12 15:41:32 +00:00
kristianduske
69da93815e Mac OS X launcher can be suppressed by passing "-nolauncher" on the command line.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@264 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-12 15:41:15 +00:00
kristianduske
b31e54bd73 Trying to recover broken XCode project files.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@263 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-10 17:51:17 +00:00
sezero
b33dc95bd9 net_sys.h: update comments and tidy up.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@262 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-09 14:03:07 +00:00
kristianduske
edf31fe611 Replaced SDL network driver with BSD driver for Mac OS X.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@261 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-09 12:44:44 +00:00
sezero
19051b0f9b struct sockaddr has unsigned char sa_len as the first member in BSD
in BSD variants and the family member is also an unsigned char instead
of (unsigned) short. So we define HAVE_SA_LEN for those BDS variants
and check for the offsetof for the sa_family member and also change
the struct qsockaddr to mirror that.  This should matter only when
PLATFORM_UNIX is defined.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@260 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-09 12:20:39 +00:00
kristianduske
c09f459026 Added the Sparkle framework to OS X launcher for automatic updates (this is not entirely ready for release yet).
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@254 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-08 13:17:35 +00:00
stevenaaus
78a24e27cc Add a "prev weapon" menu item (from Sander)
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@253 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-04 03:09:07 +00:00
sezero
79c16e7f0a host_cmd.c, menu.c: sanitize whitespace/formatting.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@252 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-02 19:45:16 +00:00
sezero
7a618b80cb menu.c: Added an options enum for the options menu. Added an options menu
entry for mouse look toggling.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@251 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-02 18:28:23 +00:00
sezero
dff408e7f5 revert incorrect changes to NUM_GAMEOPTIONS and gameoptions_cursor_table from rev. 246.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@250 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-02 17:33:03 +00:00
sezero
9498f94675 gl_mesh.c (BuildTris): worked around a type-punned pointer. adapted from quakeforge.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@249 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-01 21:11:16 +00:00
sezero
da8996a8f5 * renamed Length() to VectorLength() for consistency with its friends.
* mathlib.c: Removed the unnecessary sqrt() prototype.
(VectorLength): Made it to just return sqrt(DotProduct(arg,arg))
(VectorNormalize): Calculate the length as sqrt(DotProduct(arg,arg)).
* mathlib.h (CLAMP): Renamed the macro arguments from min and max to
_minval and _maxval.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@248 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-01 19:22:46 +00:00
stevenaaus
b9ab6be4f8 Add a statusbar alpha slider, and change default scr_sbaralpha to 0.95
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@247 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-29 06:48:25 +00:00
stevenaaus
b63d812769 Link the status bar size to the scale slider, though it's size only increases half as fast
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@246 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-29 01:52:04 +00:00
stevenaaus
f0ee5581c0 History fixed - Ozkan's newline fix seems ok.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@245 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-28 07:50:27 +00:00
stevenaaus
10b21499a2 Make some fixes for command line history now that history is persistent
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@244 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-28 07:08:16 +00:00
stevenaaus
977e81c8c1 There seems bugs in the command-line code. Revert this "blank newline" fix first, then look for more
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@243 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-27 21:45:33 +00:00
stevenaaus
6ffcbdc338 -bgvolume switch stays... Allows CD music/ambient music to play while minimized
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@242 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-26 08:47:11 +00:00
sezero
ab217aaf82 Under windows, run the game (windowed), go into a saved game,
press Esc to get the menu, minimize using the mouse on the
window's minimize icon and then restore and you'll have sound
all the same.  HOWEVER: If you minimize by pressing the icon
on the start bar, sound will be lost upon restoring. Or, if
you use alt-tab to get away from the game window the same will
happen. Or, if you run the game fullscreen and use alt-tab to
go to the desktop (alt-tab is the only way I know) you will
lose the sound again.  Here, we are probably are hitting an
SDL_APPACTIVE or SDL_APPINPUTFOCUS event more than once and
since the block counter goes > 1 we are not restoring properly.
For now, making snd_blocked to act as a boolean and not as a
counter fixes the issue.  Hmmm...

* main_sdl.c: Revert revision 238 change, no longer necessary.
* snd_dma.c: Make snd_blocked act as a boolean and not as a
counter.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@241 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 12:20:17 +00:00
sezero
23a767e4b2 made MAXCMDLINE definition public through keys.h.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@240 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 10:36:14 +00:00
sezero
e1c4c0d973 Windows/dirent.c: include stddef.h for MSVC to get intptr_t.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@239 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 08:28:27 +00:00
stevenaaus
8ca2bc684b (Some?) Win32/64 does not re-enable sound after app is minimized and restored, so (temporarily?) add a -bgsound switch to disable sound being muted
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@238 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-23 20:58:04 +00:00