sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
stevenaaus
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
stevenaaus
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
stevenaaus
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
stevenaaus
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
sezero
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
sezero
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
sezero
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
sezero
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
sezero
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
7bc0203aa3
pr_comp.h: fixed a harmless typo with DEF_SAVEGLOBAL
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@304 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 12:27:17 +00:00
sezero
3b39a77b92
some more constifications and fixes for deprecated conversion
...
from string constant to char*
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@303 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 12:04:19 +00:00
sezero
fb2bae914f
added comment in Host_Name_f()
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@301 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 10:22:17 +00:00
sezero
205cabbdc2
const correctness changes.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@300 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-29 02:22:55 +00:00
sezero
b310219400
gl_model.c (Mod_LoadAliasModel, Mod_LoadSpriteModel): add some enum casts
...
to make things more compatible with C++.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@299 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 10:41:41 +00:00
sezero
8bf69437f4
made the PollProcedure api compatible with C++.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@298 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 10:29:19 +00:00
stevenaaus
fded47666a
Back out Oz's cd-sdl.c changes
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@297 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 10:06:16 +00:00
sezero
81a34ac603
removed net_serial which was for dosquake only.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@296 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 09:55:43 +00:00
sezero
f1ed5896cc
screen.h (canvastype): Added CANVAS_INVALID as a new enumerated value (-1).
...
gl_draw.c (GL_Set2D): Use CANVAS_INVALID instead of -1.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@295 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 09:20:19 +00:00
sezero
8315ed0198
main_sdl.c: removed dedicated setup TODO notes. added a new TODO note about
...
setting up the dedicated server with less memory.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@294 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 09:11:57 +00:00
sezero
7b2134168b
cd_sdl.c: cleaned up the latest mess a little. restricted track progressing
...
to the cd player facility only.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@293 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 09:04:16 +00:00
stevenaaus
83a08ef79a
cd fix needed fo gameplay
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@292 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 01:28:40 +00:00
stevenaaus
a8de20a97d
Make "cd play" progress tracks
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@291 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-24 00:35:22 +00:00
sezero
30b71faa55
* cd_sdl.c (export_cddev_arg): make putevn() actually work.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@290 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 23:46:16 +00:00
sezero
8138aa8608
* cd_sdl.c (export_cddev_arg): fixed bad snprintf and the crash it was
...
causing.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@289 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 23:20:16 +00:00
sezero
a7dba17c55
cd_sdl.c: no need for uhexen2's CVS version identifier to stay here.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@288 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 17:23:39 +00:00
sezero
339fd92605
* cd_sdl.c (get_cddev_arg): fix stupid typo in uppercasing.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@287 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 15:55:54 +00:00
sezero
201ae03fdb
* cd_sdl.c (get_cddev_arg): check for null or empty arguments also
...
for non-windows platforms.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@286 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 14:32:34 +00:00
sezero
905f6e8ed7
* 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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@285 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 14:05:32 +00:00
stevenaaus
0494f72f2b
cd command tweaks
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@284 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 10:31:00 +00:00
stevenaaus
a0f158b276
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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@283 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 09:49:03 +00:00
stevenaaus
01218ee9ae
Set SDL_CDROM environment variable when using -cddev. Some doco updates.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@282 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-23 04:12:19 +00:00
sezero
a441851f2b
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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@281 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-20 02:25:22 +00:00
sezero
bc333b5bc8
Makefile.w32, Makefile.w64: made them a little bit more flexible by adding
...
CROSS_COMPILE and TARGET variables.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@280 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-17 19:30:35 +00:00
sezero
4bbc06e5c7
pr_cmds.c (PF_traceline): Added a FIXME note about the NaN issue with certain progs.dat
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@278 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 21:02:31 +00:00
sezero
78cbc8cc5f
added q_stdinc.h, adapted from uhexen2, to tidy up several includes and
...
macros in one place.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@277 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:55:39 +00:00
sezero
b4b84d9526
pr_cmds.c (PF_traceline): fix entity number printing.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@276 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:50:31 +00:00
sezero
6e94af1372
mathlib.h, mathlib.c: changed nanmask from being a global to being
...
a macro.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@275 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:10:20 +00:00
sezero
aee8fe5f2f
* pr_cmd.c: replaced isnan() calls with quake's own ISNAN() macro.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@274 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 20:06:06 +00:00
kristianduske
78f8041715
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@272 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 19:41:09 +00:00
stevenaaus
02c566eec0
Miscellaneous doco updates
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@269 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 05:01:12 +00:00
stevenaaus
41d8164068
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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@268 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 03:59:29 +00:00
stevenaaus
d9ed158672
Swap left and right arrow keys in the videomode menu. (Right arrow now increases resolution, which is more standard)
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@267 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-14 03:42:52 +00:00
sezero
a67c4ddf4a
net_sys.h: update comments and tidy up.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@262 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-09 14:03:07 +00:00
sezero
40b6d80f99
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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@260 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-09 12:20:39 +00:00
stevenaaus
26d6246ff9
Add a "prev weapon" menu item (from Sander)
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@253 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-04 03:09:07 +00:00
sezero
427d671c24
host_cmd.c, menu.c: sanitize whitespace/formatting.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@252 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-02 19:45:16 +00:00
sezero
11b6986944
menu.c: Added an options enum for the options menu. Added an options menu
...
entry for mouse look toggling.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@251 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-02 18:28:23 +00:00
sezero
edd2a2a34f
revert incorrect changes to NUM_GAMEOPTIONS and gameoptions_cursor_table from rev. 246.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@250 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-02 17:33:03 +00:00
sezero
6bbb06b490
gl_mesh.c (BuildTris): worked around a type-punned pointer. adapted from quakeforge.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@249 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-01 21:11:16 +00:00
sezero
e1046e68c6
* 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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@248 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-08-01 19:22:46 +00:00
stevenaaus
57bf6f49b9
Add a statusbar alpha slider, and change default scr_sbaralpha to 0.95
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@247 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-29 06:48:25 +00:00
stevenaaus
86dea5717b
Link the status bar size to the scale slider, though it's size only increases half as fast
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@246 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-29 01:52:04 +00:00
stevenaaus
630499ae8f
History fixed - Ozkan's newline fix seems ok.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@245 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-28 07:50:27 +00:00
stevenaaus
57484778cd
Make some fixes for command line history now that history is persistent
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@244 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-28 07:08:16 +00:00
stevenaaus
30d9246c7b
There seems bugs in the command-line code. Revert this "blank newline" fix first, then look for more
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@243 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-27 21:45:33 +00:00
stevenaaus
b9f418d276
-bgvolume switch stays... Allows CD music/ambient music to play while minimized
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@242 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-26 08:47:11 +00:00
sezero
f81f9f5e05
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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@241 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 12:20:17 +00:00
sezero
b4ae05875e
made MAXCMDLINE definition public through keys.h.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@240 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 10:36:14 +00:00
stevenaaus
54a2f21892
(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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@238 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-23 20:58:04 +00:00
stevenaaus
c31e3d107a
Enable messages and says to be 256 chars long, with a scrolling input line across top of screen. Allow tab button in demos.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@237 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-23 20:55:11 +00:00
sezero
cfee212570
keys.c (History_Shutdown): Don't let it write an empty string to history.txt
...
if no console commands were used.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@235 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-26 10:50:40 +00:00
sezero
f7d02fcbbf
host.c (Host_Init): Do not exec quake.rc for dedicated servers. Instead,
...
exec autoexec.cfg and stuffcmds in that case. Also moved running the start
map for dedicated servers here.
host_cmd.c (Host_Startdemos_f): Moved running the start map for dedicated
servers to Host_Init().
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@234 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-26 08:45:40 +00:00
sezero
29d4cad280
host.c (Host_Init): Don't call V_Init, Chase_Init, Key_Init, Con_Init, M_Init,
...
ExtraMaps_Init and Modlist_Init for dedicated servers either.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@233 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-26 08:16:58 +00:00
sezero
bd2385e5ea
* keys.c (HISTORY_FILE_NAME): define simply as history.txt without
...
prefixing with a game directory, so that the history file would be
written into the basedir and not affected by dynamic game directory
changes.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@232 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-26 07:56:28 +00:00
sezero
52f4e89d99
host.c (Host_Shutdown): Write the console command history file only if
...
not a dedicated server. Same for shutting down the CDAudio and sound
subsystems.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@231 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-26 00:31:12 +00:00
sezero
7383a1647b
keys.c (History_Init): Made global again.
...
(History_Shutdown): Likewise.
keys.h: Added prototypes for History_Init and History_Shutdown.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@230 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-26 00:15:22 +00:00
sezero
9154ed3539
* keys.c (History_Init): Make it static. Tidy-up its formatting.
...
(History_Shutdown): Likewise.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@229 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-25 23:55:41 +00:00
stevenaaus
819208b38c
Add Bakers/Ezquakes persistent history feature
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@228 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-25 13:32:49 +00:00
sezero
c1ff4646c2
net_udp.c, net_wins.c, net_wipx.c: Add more informative debug messages.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@227 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-22 18:11:00 +00:00
sezero
eeb7b890ca
net_wins.c (WINS_GetLocalAddress): Make sure buff is null terminated.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@226 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-22 18:09:02 +00:00
sezero
1da39b9337
net_wins.c (WINS_Init): Fix error return value as INVALID_SOCKET.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@225 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-22 18:05:43 +00:00
sezero
fe05326ae9
* console.h (Con_DebugLog): Add prototype.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@224 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-22 11:02:13 +00:00
sezero
b65383bf2d
Reorganize files for platform-specific code:
...
* sys_sdl_win.c: Copied from sys_sdl.c. Windows-only. Remove unix code.
(Sys_Init): New procedure. Call AllocConsole() and get input and output
handles for dedicated servers.
(Sys_ConsoleInput): Add a windows version.
(Sys_Error): Adjust for the allocated console and use windows api.
Adjust message output. Remove the console timeout, doesn't work somehow.
Just display the console for 3 seconds and then exit. Rely on SDL that
it redirects/logs the stdout/stderr to files.
* sys_sdl_unix.c: Rename from sys_sdl.c. Unix-only. Remove windows code.
(Sys_Init): New procedure.
(Sys_Error): Remove Windows-oriented dedicated server specific code.
Adjust message output.
* sys_sdl.c: Delete.
* sys.h (Sys_Init): Add prototype.
* main_sdl.c (main): Call Sys_Init().
* pl_linux.c (PL_ErrorDialog): Remove terminal printing which Sys_Error
already does.
* pl_osx.m (PL_ErrorDialog): Update from uhexen2.
* pl_win.c: Make icon handle static. whitespace and formatting tidy-up.
* Makefile, Makefile.darwin, Makefile.w32, Makefile.w64: Adjust for the
sys_sdl.c name change to sys_sdl_unix.c and sys_sdl_win.c.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@223 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-22 11:01:24 +00:00
sezero
fa6bc1ca0d
* net_udp.c (UDP_Read): Remove the get_qsockaddr() helper which came from the
...
old fitzsdl port, and use the struct qsockaddr *addr argument with typecasting
as in original quake.
(get_qsockaddr): Remove.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@222 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-21 16:23:06 +00:00
sezero
027f7d2033
* net_udp.c (UDP_Init): Fix Con_SafePrintf() call.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@221 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-21 16:17:17 +00:00
sezero
6fa1c54ada
net_udp, net_wins, net_wipx network drivers update:
...
- do not try to set the quake hostname to the machine name if it isn't set.
- use the newly added unix/windows socket api compatibility macros from
net_sys.h: using just an int as the socketfd wasn't a problem without win64
support: the windows SOCKET type is not only unsigned but may actually be
wider (uintptr_t, which is 8 bytes on win64).
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@220 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-21 15:24:40 +00:00
sezero
b1835226d6
net_sdlnet.c: reverted parts of rev. 197/198.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@219 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-21 13:27:30 +00:00
sezero
1f9a960e86
net_main.c: more trivialities.
...
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@218 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-06-21 12:27:30 +00:00