Commit graph

545 commits

Author SHA1 Message Date
sezero
6c110e15a3 Updated support for building the OSX versions using Makefile.darwin. Do
not rely on sdl-config on OSX Framework builds, define new SDL_FRAMEWORK
and NO_SDL_CONFIG preprocessor macros to indicate that and include SDL.h
with the "SDL" subdirectory name included. Add new libmad and ogg/vorbis
headers and static and dynamic libraries for macosx. Xcode project files
need further updating.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@699 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-08-16 04:51:41 +00:00
sezero
f2caec926e fixed compilation
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@698 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-19 05:40:16 +00:00
sezero
bf35f44bf1 cl_demo.c (CL_PlayDemo_f): set key_dest to key_game only when the
demo file is successfully opened.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@697 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-18 21:20:07 +00:00
sezero
c00571286e * cl_demo.c: for a command like "record demoname map [track]", don't
continue if the map cannot be started. do not continue if the demo
  file cannot be opened for the timedemo command. for playdemo, verify
  that the forcetrack '\n' byte appears among the very first 12 bytes
  of the file.
* r_world.c (R_MarkSurfaces): reset vis_changed to false.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@696 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-18 20:51:35 +00:00
sezero
27b29f27f6 cl_main.c (CL_Disconnect): set cl.intermission to 0. Fixes a minor
intermission glitch which isn't hit easily. See Baker's notice at:
http://forums.inside3d.com/viewtopic.php?t=4944

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@695 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-16 17:00:24 +00:00
sezero
de78abe420 Fixed increased (more than 32) dynamic lights.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@694 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-10 11:21:17 +00:00
svdijk
70e2c7ded5 Rework the linux icon a bit, also store smaller (indexed color)
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@693 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-07 20:14:52 +00:00
sezero
0425d76d98 arch_def.h: Added GNU/Hurd defs.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@692 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-07 07:15:23 +00:00
sezero
c51b7a899d GNU/Hurd has BSD-style struct sockaddr too (reported by Svante Signell
in debian bug #657793)
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=657793

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@691 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-07-07 05:09:55 +00:00
sezero
28eb6f0150 zone.c: Use memcpy() instead of strcpy() in Hunk_Strdup() and Z_Strdup().
Removed dead Cache_Compact() function. Made mainzone static to zone.c.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@689 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-06-25 14:50:17 +00:00
sezero
3e9ec5f401 updated snd bits from uhexen2. added signed 8 bit format support
to the mixer.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@688 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-06-25 12:50:09 +00:00
sezero
0eb805e919 updated arch_def.h and net_sys.h from uhexen2
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@687 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-06-25 11:51:23 +00:00
sezero
e39b2ca3c8 * keys.h: renamed KP_* key macros to K_KP_*.
* key.c (Key_ClearStates): Instead of clearing all key's down state
  and repeat count, run KeyEvent(k,false) keys in down state, which
  will already clear those states for them. This also helps getting
  rid of several actions bound to keypad keys. Minor cleanups.
* gl_vidsdl.c (ClearAllStates): Removed code triggering every key
  with a release event, because we just changed Key_ClearStates() to
  do that for the necessary keys.
* in_sdl.c: Minor cleanups. Made K_KP_5 to send '5' when not in game
  mode, regardless of the numlock status. Moved prev_gamekey to top
  level and call SDL_EnableUNICODE() correctly.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@686 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-06-25 11:20:38 +00:00
svdijk
798b777233 in_sdl.c: Add missing KP_NUMLOCK key event.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@685 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-06-10 06:09:50 +00:00
svdijk
9b86e17502 Small update to r683.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@684 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-06-08 20:06:40 +00:00
svdijk
ded49555b1 Re-introduce KP_* syms, but only "in-game".
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@683 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-06-08 19:27:12 +00:00
svdijk
2a36ecd51b pl_linux.c: Set icon only if mask creation is successful.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@682 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-30 18:31:41 +00:00
svdijk
66adde7474 Makefile, Makefile.darwin: Remove the not-so-useful "install" target.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@681 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-30 17:29:34 +00:00
sezero
b5ecc9e636 added missing cast in PL_CreateIconMask() to fix compilation using g++
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@680 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-30 10:55:35 +00:00
sezero
b3b4432138 Makefiles: defined new variable LINKER. for linkage we no longer use $(CC),
but $(LINKER)

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@679 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-30 09:47:45 +00:00
sezero
436f0f980f fix linkage for solaris: needs -lsocket -lnsl -lresolv for network
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@678 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-30 09:28:34 +00:00
sezero
08d5e1ac69 removed the SNDDMA_GetSamples() call from snd_dma.c:GetSoundtime() for solaris
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@677 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-30 09:00:12 +00:00
sezero
aa4c9ebc40 renamed model_t to qmodel_t in order to avoid conflicts on solaris.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@676 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-30 08:56:06 +00:00
svdijk
62b1c9267a gl_warp.c: revert part of r653, not really needed.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@675 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-27 09:01:55 +00:00
sezero
91a17cce70 minor gl_vidsdl.c cleanups: tidied up VID_SetMode(). Removed the defunct
_windowed_mouse cvar. Simplified va()+Cvar_Set() calls into Cvar_SetValue().

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@673 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-21 12:32:20 +00:00
svdijk
d9040eefff Minor linux icon tweak.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@672 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-17 06:02:50 +00:00
sezero
1120671550 don't print both of the two possible warning messages in PF_VarString()
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@671 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-15 16:10:13 +00:00
svdijk
0c9ff95e9b pr_cmds.c: Make PF_VarString's buffer a bit larger (fixes UQC's menu).
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@670 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-15 14:41:29 +00:00
svdijk
6bce934ae3 Use new transparent icon for linux (32x32 for now).
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@665 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-05-10 20:21:20 +00:00
svdijk
133184d1ea keys.[ch]: comment out KP_* keys, since we map them to their K_* counterparts
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@663 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-04-23 18:01:47 +00:00
sezero
1b51748596 snd_mp3.c, snd_vorbis.c, snd_wave.c: Make _sure_ that the number
of channels in the music file is supported, i.e. either stereo or
mono. Minor tidy up of the error return paths.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@661 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-04-22 11:02:08 +00:00
sezero
0bc25ece34 removed the envmap command which drew to front buffer. adjusted the
timerefresh command not to draw to the front buffer. also made sure
that there is an active connection when timerefresh is called.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@660 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-04-22 07:55:56 +00:00
svdijk
f1554e1f37 in_sdl.c: invert the behaviour of numlock (numbers when on, not when off)
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@659 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-04-20 20:23:55 +00:00
sezero
dd9733f870 common.c: until COM_CheckRegistered() is called keep the value of the
registered cvar as 1, set it right in COM_CheckRegistered().  fixes the
problem of registered game installed from later versions of cdroms not
being properly recognized by versions 0.85.6 and 0.85.7.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@658 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-04-20 19:47:22 +00:00
sezero
7b5b0b6502 Limited the struct qsocket_s details only to net_*.c sources :
For menu serverlist handling, added new procedures NET_SlistSort,
NET_SlistPrintServer and NET_SlistPrintServerName. Added new
procedure NET_QSocketGetTime for status and spawn commands' print
functionality in host_cmd.c. Added new NET_QSocketGetAddressString
procedure for status and connect commands' print functionality in
host_cmd.c and sv_main.c.  Patch ported over from uhexen2.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@657 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-04-18 20:33:12 +00:00
sezero
f8c136c534 * net_dgrm.c: Fixed the types of testSocket and test2Socket from int
to sys_socket_t.
* updated version date stamp to 2012-04-01.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@656 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-04-01 18:03:25 +00:00
sezero
5c04251a36 cmd.c, gl_texmgr.c, gl_texmgr.h: killed the rest of the -Wsign-compare warnings.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@655 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-31 18:30:09 +00:00
sezero
ca8b38b076 Added file count and header crc macros for id1/pak0.pak v1.00 and v1.01
so that the corresponding shareware versions actually work properly and
not error out.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@654 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-28 17:50:47 +00:00
svdijk
625e9f6518 gl_warp: save some cvars to config.cfg.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@653 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-25 19:08:31 +00:00
sezero
dee036353f * mathlib.h (IS_NAN): Fixed strict aliasing violation by providing
an inline function using a float/int union instead of the original
  macro.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@650 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-24 06:24:56 +00:00
sezero
661379c20a bumped version to 0.85.8 in the development tree
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@648 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-14 07:02:41 +00:00
sezero
b75db882b0 Moved the stufftext_frame global to client_static_t structure and
adjusted CL_GetDemoMessage and CL_ParseServerMessage accordingly.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@644 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-12 08:24:16 +00:00
sezero
1bc8ffdb15 minor Makefile tidying
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@642 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-09 10:11:09 +00:00
sezero
5fe60a036b changed the rowbytes, width, height, conwidth and conheight members of
viddef_t from unsigned to signed int. fixed the -Wsign-compare warnings
for NUM_GLMODES. fixed compilation using g++, by adding a missing type
cast.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@641 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-08 10:14:58 +00:00
stevenaaus
39f9ad3116 'make install' directory needs trailing slash in order to fail (desired) if directory doesn't exist.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@640 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-08 07:17:49 +00:00
sezero
934aeb38e6 cmd.c (Cbuf_InsertText): Unconditionally add a newline after the inserted
text. Fixes executed files without a newline at the end of them eating up
followup commands.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@639 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-03-03 21:55:53 +00:00
sezero
79d0808dca apply anisotropic level setting only to mipmap textures
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@638 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-02-18 22:04:38 +00:00
sezero
89a1c03243 at least use the api sensibly and don't screw the whitespace
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@637 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-02-12 11:33:07 +00:00
stevenaaus
314774c99c common.c
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@636 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-02-12 02:59:21 +00:00
sezero
39965c2472 common.c (COM_FindFile): reverted ultra-hacky revs. 627-629. made it to
report files which aren't found only if developer.value >= 2, i.e. used
Con_DPrintf2 of fitz for the first time since its creation.. would have
been better if I'd implement and use Sys_DPrintf() there.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@634 af15c1b1-3010-417e-b628-4374ebc0bcbd
2012-02-11 15:55:09 +00:00