30c936880c
backports from uhexen2 source, preparing for streaming music support:
...
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
6a070ea797
added windows version detection back from original sources
...
with extra bits from uhexen2. we may use the information some
day.. (or not..)
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@354 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:00:19 +00:00
22e2f5aca8
backports from uHexen2 tree:
...
* common.c, common.h: Added new structure fshandle_t. Added new procedures
FS_fread, FS_fseek, FS_ftell, FS_rewind, FS_feof, FS_ferror and FS_fclose.
The new FS_*() stdio replacements are necessary if one is to perform non-
sequential reads on files reopened on pak files because bookkeeping about
file start/end positions is needed. Allocating and filling in the fshandle_t
structure is the users' responsibility when the file is initially opened.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@353 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 16:50:15 +00:00
82ccf48171
added file_from_pak as a new flobal, made COM_FindFile() to set it properly.
...
from quakeworld sources.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@352 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 16:35:16 +00:00
f4b0b373cb
Minor cd_sdl.c cleanups from uhexen2. Reorganized cdaudio volume
...
handling. If volume is 0, don't bother advancing and pause.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@351 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 14:55:25 +00:00
d0ae9d2d65
snd_mem.c updates from uhexen2 :
...
* q_sound.h: add WAV_FORMAT_PCM as a new macro, defined as 1.
* snd_mem.c (S_LoadSound): use WAV_FORMAT_PCM. reject wav files which are
neither 8 nor 16 bit. reject wav files which have zero samples. report
the wav file name with the error messages so that they mean something.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@350 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 14:39:12 +00:00
b4ee053e2d
renamed sound.h to q_sound.h
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@349 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 14:30:52 +00:00
7fddf9abdc
gl_vidnt.c, gl_vidsdl.c: Reformatted GL_CheckExtensions for better readability,
...
removed the old unused CheckArrayExtensions.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@348 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-26 22:10:44 +00:00
6fe1dbab48
* sv_main.c (SV_WriteEntitiesToClient): the protocol check must be against
...
sv.protocol, not sv_protocol.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@347 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-11-23 06:48:02 +00:00
671da2bc11
SDL_putenv() is problematic in versions <= 1.2.9 so replaced it with plain putenv().
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@346 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-11-12 15:51:04 +00:00
14f356c45e
menu.c: restore the screen size menu item that was removed in rev. 125.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@345 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-10-29 13:03:04 +00:00
445ecebee4
cmd.c: Fix the unalias command.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@344 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-10-24 14:15:27 +00:00
c14af608a9
more max_edicts stuff (from Sander)
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@343 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-10-24 07:57:46 +00:00
03b6281f52
Bump max_edicts for compatibility with WarpSpasm
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@342 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-10-23 21:50:16 +00:00
3a41b14315
* snd_mem.c: Remove prototype for non-existant function S_Alloc().
...
Remove unused global cache_full_cycle. Comment out unused function
DumpChunks().
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@341 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-10-18 20:39:10 +00:00
6869b0c6d5
increased default zone memory size to 384kb
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@340 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-10-11 18:06:11 +00:00
ece77629ad
cmd.c (Cmd_Alias_f): replace another occasion of Z_Malloc() + strcpy() by Z_Strdup().
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@339 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-10-04 07:40:12 +00:00
8024ffd5dd
Add quake retexturing project patch
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@338 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-22 09:03:22 +00:00
9d07b6cbd6
* console.c, sbar.c: fixed a few format string issues.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@337 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-20 08:27:20 +00:00
ae617c3a1f
Added version information to launcher window.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@336 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-20 08:11:33 +00:00
d96679c553
Changed signing scripts to use stock openssl over the macports version. Signing and automatic updates now work on OS X.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@335 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-20 06:24:15 +00:00
007a32f925
Updated bundle version and strings to 0.85.4.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@334 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 16:01:31 +00:00
f2d89a0c03
Cleaned up two symlinks.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@333 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 15:40:49 +00:00
f18e9763fd
Added Sparkle framework to SVN again. Hope the stupid symlinks don't cause trouble again.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@332 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 11:46:03 +00:00
683191478c
Better Sparkle Update GUI (less intrusive).
...
Removed Sparkle Framework to sort out SVN problems, will re-add with next commit.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@331 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 11:36:13 +00:00
39e6259511
bumped version to 0.85.4 in the development tree.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@330 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 09:11:38 +00:00
f02986d16a
Fix download links in doco
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@328 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 01:37:19 +00:00
eb93da64f5
Minor doco update for 0.85.3 release
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@327 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-19 01:24:11 +00:00
587aca47b3
Change build architecture to universal PPC/x86/x86_64.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@326 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-18 09:15:22 +00:00
ef1f485816
Disabled automatic updates through Sparkle for now due to signing problems.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@325 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-18 09:01:16 +00:00
9e2893ab59
Preparations for 0.85.3 release.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@324 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-17 13:00:00 +00:00
da41bc958b
Removed Sparkle keys from repository.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@323 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-17 10:42:00 +00:00
ed367aa55e
fix dangling symlinks
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@322 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-01 10:15:49 +00:00
6177ae068a
makefile comment tweaks
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@321 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-09-01 06:10:21 +00:00
5ade0c29df
replaced all usess of vsprintf by q_vsnprintf
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@320 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-31 16:57:12 +00:00
49286c1eb2
added q_snprintf and q_vsnprintf from uhexen2. always use our wrapper
...
versions to ensure consistent behavior accross platforms.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@319 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-31 14:09:00 +00:00
3e1087164e
host_cmd.c: minor tidy up, nothing serious.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@318 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-31 12:15:38 +00:00
7271fcb9fe
host_cmd.c (Host_Say_f, Host_Tell_f): adjustments, mostly inspired from
...
the darkplaces engine.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@317 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-31 11:55:55 +00:00
b06952472b
updated dirent.[ch] from mingw-w64.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@316 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-30 13:50:28 +00:00
12a9aa1004
fixed lazy declaration and cleaned up the .bsp extension removal logic.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@315 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-30 02:51:21 +00:00
31c71800ae
remove the defunct cls.mapstring
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@314 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-30 02:15:22 +00:00
da578286cc
Remove any trailing ".bsp" from mapname
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@313 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 23:03:50 +00:00
8d58b764d6
End of the world commit
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@312 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 21:37:07 +00:00
2042d5ca2d
moved CodeBlocks and Visual Studio project files under their own directories.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@311 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 17:51:38 +00:00
50b80f6c5c
pr_edict.c (PR_LoadProgs): silenced a minor compiler warning after the const changes.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@310 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 17:50:20 +00:00
5b65ff9654
manual update of CodeBlocks project files.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@309 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 16:56:00 +00:00
58f44e21f7
CDAudio_Next() and CDAudio_Prev() aren't public to the engine and do not
...
belong in a placeholder like cd_null.c.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@308 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 16:02:55 +00:00
2d5f1285e9
more fixes for deprecated conversion from string constant to char*:
...
handle the -safe command line switch using a new global safemode,
check for safemode in the related driver init functions and remove
the safeargvs & co from common.c and COM_InitArgv().
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@307 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 12:55:41 +00:00
ac8fd3e7b0
pr_edict.c: changed the type arguments of PR_ValueString() and PR_UglyValueString()
...
from etype_t to int for C++ compatibility. from uhexen2.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@306 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 12:36:03 +00:00
94fd50da1e
constified basedir member of quakeparms_t
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@305 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 12:33:33 +00:00
sezero
stevenaaus
kristianduske