Commit graph

827 commits

Author SHA1 Message Date
sezero
9a0d6c7328 Made sure that deathmatch and coop are not set at the same time
(fix originally from QIP sources of Matthias Buecher, a.k.a. Maddes)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@536 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-23 12:03:49 +00:00
sezero
359e770d65 removed support for the -mode argument from gl_vidsdl.c
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@535 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-22 23:10:25 +00:00
sezero
1089ae52a2 gl_vidsdl.c fixes/changes from Sander van Dijk: if (hypothetically) no
fullscreen modes are reported at all fixes bad behaviour of several
options in the video menu, and allows the user to use "-force" to force
a fullscreen mode even if none was reported; this was previously only
possible if there was at least one fullscreen mode reported), makes the
treatment of "-current" more similar to "-width/-height/-bpp" (only
forcing it if the user provides "-force"), gets rid of leavecurrentmode
hack (which didn't do much useful, besides making the code less clear).

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@534 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-22 21:55:48 +00:00
sezero
b7ee9177d0 main_sdl.c: added SDL version check at runtime requiring at least SDL-1.2.10
and rejecting SDL >= 1.3.x.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@533 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-22 21:20:19 +00:00
sezero
201c4c6dc0 sys_sdl_unix.c, sys_sdl_win.c (Sys_Sleep): rely on SDL_Delay() instead
of platform specific usleep() or Sleep() calls.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@532 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-21 10:40:18 +00:00
sezero
1303651a7b backport from uhexen2: read video variables early so that a vid_restart
isn't necessary after init. thanks to Sander van Dijk.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@531 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-20 09:22:19 +00:00
sezero
9039243d5f gl_vidsdl.c: comment out the rest of vid_refreshrate usage which isn't supported.
(VID_SetMode): check whether SDL_SetVideoMode() actually succeeded. otherwise we
just segfault. noticed by Sander.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@530 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-18 16:27:14 +00:00
sezero
2e09ec39c5 * client.h: moved usercmd_t structure to protocol.h
* quakedef.h: moved chase declarations to client.h.
  moved the entity_state_t structure to protocol.h.
  tweaked the order of quake header includes.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@529 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-18 10:03:53 +00:00
sezero
e6c2601492 net_win.c, net_sdl.c, net_bsd.c, net_defs.h: removed fixed size from net_drivers
and net_landrivers. changed net_numdrivers and net_numlandrivers into const int
and assigned their values using array size macros instead of hardcoded numbers.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@528 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-18 10:00:36 +00:00
sezero
bd7b39c6dd sv_main.c: changed a (cls.state != ca_dedicated) condition into (!isDedicated)
so that a server file doesn't use "cls"

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@527 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-18 09:55:18 +00:00
sezero
51ed74811e net_loop.h: Tiny whitespace tidy up.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@526 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-18 09:51:28 +00:00
sezero
10b8dd954a net_dgrm.c: removed the DEBUG build condition around the "Forged packet received"
message prints. Tiny whitespace tidy up.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@525 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-18 09:50:49 +00:00
sezero
893487a136 SDL input driver: updated from the uHexen2 project adding native keymap
and dead key support to the console, thanks to Sander van Dijk.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@524 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-16 14:11:37 +00:00
sezero
a6a1fb15e7 keys.c (History_Init): filter out '\r' and skip over to the first non-EOL
character. This allows using a windows-generated history.txt file on unix.
based on a patch from Sander van Dijk.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@523 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-15 21:41:48 +00:00
sezero
13fedad011 keys.c (Key_Event): Allow autorepeats in message (chat) mode; based on a
patch from Sander van Dijk.  Rearrange the autorepeat condition checks a
bit, based on uhexen2.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@522 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-15 16:33:52 +00:00
sezero
28140a132a menu.c (M_ToggleMenu_f): Set key_dest to key_game only if the client
is connected. Set it to key_console, otherwise. Patch from and thanks
to Sander van Dijk.
(M_Main_Key): Likewise.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@521 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-15 16:21:36 +00:00
sezero
bd8cc29f4e sys_sdl_unix.c, sys_sdl_win.c (Sys_ConsoleInput): Moved isDedicated check to...
host.c (Host_GetConsoleCommands): ... here, where it should be.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@520 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-15 15:51:28 +00:00
sezero
68ed435145 gl_texmgr.c (TexMgr_LoadPalette): properly point to d_8to24table_fbright
(noticed this in recent RMQ sources.)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@519 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-15 06:37:12 +00:00
sezero
43b6ee16e8 host_cmd.c (Host_Loadgame_f): Close the file before signalling an error
(noticed this in recent RMQ sources.)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@518 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-15 06:31:51 +00:00
sezero
b4b9090d03 gl_model.c (Mod_SetExtraFlags): Fixed r_nolerp_list.string parsing code
of fitzquake: the loop was able to go beyond the null terminator of the
cvar.  (Besides, it would technically yield a false positive because of
strncmp(), but much less likely..)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@517 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-14 14:21:12 +00:00
sezero
6ef1c8b70a CL_ParseUpdate: removed unused bitcounts[] array
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@516 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-13 19:00:25 +00:00
sezero
b225ca736a Cmd_Alias_f: don't append a space at the very end.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@515 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-13 18:40:23 +00:00
sezero
8d4e5768fc Cmd_TokenizeString: simplify duplication by using Z_Strdup()
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@514 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-13 18:35:40 +00:00
sezero
b76812e60d can these guys code in ANSI C????
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@513 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-13 09:12:16 +00:00
sezero
4a08a54a78 renamed Sys_FloatTime to Sys_DoubleTime (the thing always returned double
you know..) and adjusted all callers accordingly.  changed Sys_Sleep() to
take a milliseconds argument, added implementations for unix (usleep) and
windows (Sleep).

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@512 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 16:01:01 +00:00
sezero
9707080487 Made the cmd argument of CL_SendMove() const.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@511 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 14:11:17 +00:00
sezero
de8e861523 constified the name arguments of Image_LoadImage() and Image_WriteTGA()
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@510 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 12:56:57 +00:00
sezero
178a43c068 re-diff'ed the quake_retexturing_project.patch so that it applies cleanly
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@509 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 12:44:17 +00:00
sezero
6fffda6b99 made Sys_ConsoleInput() to return const
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@508 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 12:02:37 +00:00
sezero
7e595df33f made unix Sys_mkdir() to print strerror in case of failure.
made windows Sys_mkdir() to use windows api functions.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@507 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 10:50:26 +00:00
sezero
b89dd7149a removed privileged member from the client structure
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@506 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 09:50:23 +00:00
sezero
8e9726cc12 pr_exec.c (PR_ExecuteProgram): Implemented some of LordHavoc's
optimizations mostly by removing the temporary eval_t *a,*b and *c
variables and replacing them by OPA, OPB and OPC macros. Removed
the statement index s and used the statement pointer instead,
updating the pr_xstatement global whenever necessary. In OP_STATE,
stored OPA->_float to ed->v.frame without comparing them (I don't
understand the significance to the comparison.)  Casted st->a, b
and c to unsigned short instead of using them signed as they are
as the pr_globals index value. Updated profiling code.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@505 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 09:03:34 +00:00
sezero
5291960d56 pr_comp.h, pr_edict.c, progs.h, pr_cmds.c, pr_exec.c: made some of the
variables and functions private and did some whitespace tidy-ups.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@504 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-12-12 08:56:25 +00:00
stevenaaus
dd15b1a5bf Make 'R_DrawSprite' error messages Con_DPrintf.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@503 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-11-19 23:33:54 +00:00
sezero
a0c0c4ad36 net_udp.c: Fixed FIONREAD ioctl to take an int* argument instead of
an unsigned long*.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@502 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-11-12 18:03:49 +00:00
sezero
c03dead0ea recompiled SDL library from git snapshot a04171d6fa11 (2011-11-07, SDL-1.2 branch)
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@501 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-11-07 23:02:02 +00:00
sezero
3246601197 cd_sdl.c: Reverted the CDAudio_Update() change from 27 Oct: it does
not make things better.  Removed the SDL_CDStatus() check before the
error message in case of SDL_CDPlay() failures: I don't really know
the significance to it and witnessed that it caused the error report
once, so I don't see any merit in its presence.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@500 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-30 16:56:03 +00:00
sezero
fd39405580 windows codecs: Recompiled mpg123 from latest 1.13.4 release.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@499 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-30 16:02:34 +00:00
sezero
77f0a88c64 cd_sdl.c: Simplified, making it similar to cd_linux.c or cd_bsd.c by
performing checks every two seconds in CDAudio_Update() and caching
the last check time.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@498 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-27 09:40:46 +00:00
sezero
fb87dcd2d3 recompiled all windows x64 dlls using a new gcc-4.5-based toolchain.
also updated the SDL library to HG/1.2 branch 2011-10-14 with
patch from http://bugzilla.libsdl.org/show_bug.cgi?id=1254#c15.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@497 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-26 12:11:25 +00:00
sezero
bfb9f7af7e updated the user directories support patch
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@496 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-24 17:40:12 +00:00
sezero
805394f4df in Sbar_DrawFace(), don't let the index derived off cl.stats[STAT_HEALTH]
to become negative. (noticed this in rmq some time ago...)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@495 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-19 20:10:49 +00:00
sezero
a29f9e7264 moved README.music to top-level directory
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@494 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-19 19:33:23 +00:00
sezero
39357cdcc3 cl_demo.c: Several tidy-ups and message corrections
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@493 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-09 08:51:29 +00:00
sezero
94c76c387a updated my systest tool from uhexen2
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@492 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-07 07:12:18 +00:00
sezero
5f3ed01bc2 updated windows SDL libraries to HG/1.2 branch 2011-09-21 with two
patches applied:
http://bugzilla.libsdl.org/show_bug.cgi?id=1254#c15
http://bugzilla.libsdl.org/show_bug.cgi?id=1310

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@491 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-10-03 14:00:16 +00:00
stevenaaus
bf74c8f6db Typo: scr_crosshaircale -> scr_crosshairscale (from Sander).
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@490 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-09-21 02:51:56 +00:00
stevenaaus
84f2360ace Update sndspeed cvar when it is changed from the command line (from Sander). Note in-game changes of the sound cvars don't change sound playback settings or behaviour.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@489 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-09-20 22:45:52 +00:00
sezero
5fac2b24de added IS_LOOP_DRIVER macro and made the confusing loop driver checks
more readable. from uhexen2.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@488 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-09-20 18:05:51 +00:00
stevenaaus
0da8a9c5aa Make the default fullscreen mode 800x600 (same as window default), from Sander.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@487 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-09-20 06:41:36 +00:00