fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-14 00:50:38 +00:00
Code Issues Projects Releases Packages Wiki Activity
601 commits 51 branches 7 tags 218 MiB
Commit graph

478 commits

Author SHA1 Message Date
svdijk
2eaf8974b7 gl_screen.c:SCR_ModalMessage(): make sure we don't ignore the next keypress (after a timeout). 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@613 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-19 19:09:23 +00:00
svdijk
f53eccda96 When modetesting, redraw the screen before asking for confirmation. Otherwise the screen is just a black rectangle, which may be confusing for the user. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@612 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-18 12:48:09 +00:00
svdijk
ec75ca1621 Make the "Reset config" message more informative. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@611 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-18 12:00:35 +00:00
svdijk
d16f04cda7 gl_screen.c:SCR_ModalMessage(): sleep a little while busy-waiting. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@610 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-17 08:34:54 +00:00
svdijk
7a574b265e - Rename the "Reset defaults" menu option to "Reset config". 
- Make it reset only those cvar's that are saved to config.cfg.
- Make it as the user for confirmation.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@609 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-17 08:25:07 +00:00
sezero
e6ebf96d46 SCR_CenterPrint() has been counting the lines in the wrong place: count 
the copied string NOT the original.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@607 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-13 19:10:52 +00:00
sezero
8d8f6c108f fixed demo playback covering multiple maps (from Pa3PyX's hexen2 source) 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@604 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-09 08:10:35 +00:00
svdijk
8800a5c8eb console.c:Con_DrawInput(): some changes for correctness and simplicity 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@603 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-07 13:21:42 +00:00
sezero
42d50749e3 tidy up osx mouse acceleration hack a bit more. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@602 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-07 09:22:43 +00:00
sezero
70f452ed47 tidied up whitespace in osx mouse acceleration hack code. fixed declaration 
of the new cvar to use the new cvar flags.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@601 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-07 08:50:11 +00:00
kristianduske
cce245b688 Applied patch to disable mouse acceleration in Mac OS X. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@599 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-07 08:26:32 +00:00
svdijk
e27c150194 console.c: some long input line fixes (keep cursor on screen, don't clip line early, buffer size fix) 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@598 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-06 21:25:42 +00:00
svdijk
95ca642f59 Console word wrap fix: only check and wrap at word boundaries, not in the middle of a word. 
(Enter "r_nolerp_list" in the console for an example.)


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@595 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-03 18:03:51 +00:00
sezero
2aaefce401 bumped version to 0.85.7 in the development tree 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@592 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2012-01-01 12:00:16 +00:00
sezero
6325be70be gl_texmgr.c, gl_vidsdl.c: made a lot of functions and variables static. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@584 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-30 14:00:28 +00:00
sezero
862aa71e52 removed some OS-specific drivers. they weren't used and was here only for 
reference.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@583 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-30 13:59:14 +00:00
sezero
db10cdba6c gl_vidsdl.c (GL_Init): set VID_Changed_f() callback to vid_vsync only if 
GL_CheckExtensions() set gl_swap_control as true.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@582 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-30 12:15:19 +00:00
sezero
09ad2e875c gl_vidsdl.c (VID_SyncCvars): set vid_vsync to 1 only if the received value 
is positive, not "not zero".

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@579 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-30 00:10:16 +00:00
sezero
299557ebe3 minor typo fixes for vsync related messages. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@578 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 23:05:12 +00:00
sezero
a653822538 gl_vidsdl.c (VID_Toggle): if SDL_WM_ToggleFullScreen() succeeded, ignore 
the vid_fullscreen callback function setting vid_changed to true.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@577 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 21:44:36 +00:00
sezero
b7bbda4c94 changed some of the Cvar_Set[Value] calls to their *Quick variants in the 
source files where the vars are defined.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@576 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 21:21:11 +00:00
sezero
9ef1ddb76b silenced -Wsign-compare warnings. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@575 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 19:06:08 +00:00
sezero
982070b2c5 cleanup of Cvar_Set[Value] calls in menu.c 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@574 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 16:50:45 +00:00
sezero
349c4a81c9 some common.c cleanup: Made COM_InitFilesystem() public through common.h, 
moved its calling from COM_Init() to Host_Init() just after COM_Init().
Moved registration of registered and cmdline cvars and COM_Path_f command
and the calling of COM_CheckRegistered() to COM_InitFilesystem(). Removed
unused memsearch(). Fixed the stupidity in leading space elimination from
com_cmdline.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@573 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 15:10:18 +00:00
sezero
93fd580b18 more cvar cleanups: Added Cvar_LockVar, Cvar_UnlockVar, Cvar_UnlockAll and 
Cvar_FindVarAfter. Don't expose cvar_vars directly and use Cvar_FindVarAfter
instead.  several typo fixes, etc.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@570 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 12:28:21 +00:00
sezero
62cd7643a3 some more cvar work: made Cvar_RegisterVariable() to only link the variable in 
and set some basic flags, but then let functions to set it. Added Cvar_SetQuick
and Cvar_SetValueQuick which accept a cvar pointer instead of a var name, but
identical to the non-Quick versions otherwise. Made Cvar_SetValue to print the
value as an integer if the float value is the same when cast to an int; if not,
made it to strip the trailing zeroes in the string.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@569 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-29 09:37:28 +00:00
sezero
175a348297 dropped CVAR_SERVERINFO flag from the cmdline cvar: sending cmdline upon 
CCREQ_RULE_INFO is evil...
while I was there, did some whitespace clean-up in common.c.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@568 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-28 23:40:27 +00:00
sezero
3d4901410c * gl_screen.c: removed oldscreensize, oldfov, oldsbarscale, oldsbaralpha. 
use the callbacks for scr_fov, scr_viewsize, scr_conwidth & scr_conscale
changes by simply setting vid.recalc_refdef to 1: now that Cvar_Set()
doesn't do anything when there is no change, this has the same effect.
* snd_dma.c: removed oldvol, set a callback to sfxvol in order to call
SND_InitScaletable() upon every volume change.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@567 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-28 22:40:15 +00:00
sezero
6612180a74 * first shot at cvar flag system and cvar layer clean-ups : 
- removed the archive and server members of cvar_t structure
  which are now represented by the CVAR_ARCHIVE, CVAR_NOTIFY
  and CVAR_SERVERINFO flags.
- added new Cvar_SetROM and Cvar_SetValueROM functions to 
  set vars marked as CVAR_ROM (read-only vars) programaticaly
- added Cvar_SetCallback() as a new function to assign (or
  remove) a callback function to a cvar.
- changed Cvar_RegisterVariable() to only accept a var pointer
  as in original quake
- moved notification handling from Cvar_Set() to callbacks.
- changed Cvar_Set() so that it doesn't reallocate the var's
  string buffer if nothing is changed, nor does it run the
  var's callback.
- changed the 'registered' and 'cmdline' cvars to be read-only
  so that the users can't change it using the console.  (and
  with 'registered' flagged as CVAR_ROM, the 'static_registered'
  thing is no longer required)
- added comment that sending cmdline upon CCREQ_RULE_INFO is
  evil...
- more to follow later.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@566 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-28 22:01:33 +00:00
sezero
7a58f5033c finally nailed the SubdividePolygon() segfault when running as a dedicated 
server: R_Init() isn't called for dedicated server therefore gl_subdivide_size
was used without being registered hence divisions by zero when using its value
member. Geez.. Moved its registration to Mod_Init() and we are good.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@565 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-28 17:37:30 +00:00
sezero
96d60a3f51 cfgfile.c (CFG_ReadCvars): Also check for ferror(). Use FS_rewind() 
instead of FS_fseek(). From Sander van Dijk.
cfgfile.c, cfgfile.h: synced with uhexen2 versions.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@564 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 19:40:14 +00:00
sezero
a22c56b5ae common.c (q_vsnprintf): Don't attempt to nul terminate the buffer 
if zero size was passed. From Sander van Dijk.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@563 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 19:32:17 +00:00
sezero
f7394ffc06 added COM_ExtractExtension() helper. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@561 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 14:00:33 +00:00
sezero
ba15eced3c changed many strcpy and strncpy into q_strlcpy 
and strcat and strncat into q_strlcat

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@560 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 13:15:31 +00:00
sezero
1a4b16f741 added strlcat.c and strlcpy.c to build. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@559 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 11:11:24 +00:00
sezero
04eb8ef74d added strlcat.c and strlcpy.c: will use them later. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@558 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 11:03:39 +00:00
sezero
f797c71f8b changed many sprintf() calls into q_snprintf(). 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@557 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 10:50:42 +00:00
sezero
02c18a64e3 Makefiles update: Passing the libraries to the linker before passing the 
object list is a bad idea.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@556 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 10:10:51 +00:00
sezero
3760bbf494 reverted revision 536 which made coop and deathmatch not to be set at 
the same time

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@555 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 08:27:52 +00:00
sezero
6a940110c0 better buffer size safety with COM_StripExtension, COM_FileBase and COM_DefaultExtension 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@554 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-27 08:04:02 +00:00
sezero
8fe6e6efb4 bumped version to 0.85.6 in the development tree. documentation tidy-up. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@549 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-25 09:28:30 +00:00
sezero
8f7ced1cf2 changed cvar callback functions to accept a cvar_t pointer arg. I may 
have a use for that later.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@545 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-24 14:04:01 +00:00
sezero
49e4762ac2 minor correction after last cfgfile patch. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@543 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-24 12:35:01 +00:00
sezero
282fac9686 changed cfgfile to use FS_functions. From Sander van Dijk. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@542 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-24 12:10:15 +00:00
sezero
7becf71d2f added FS_fgets(). From Sander van Dijk. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@541 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-24 12:03:29 +00:00
sezero
60a764f30e tidy up nul termination for strncpy in CFG_ReadCvarOverrides (from Sander.) 
update copyright years.

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@540 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-24 12:02:25 +00:00
sezero
fea02186c7 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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@536 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-23 12:03:49 +00:00
sezero
8dbddbd097 removed support for the -mode argument from gl_vidsdl.c 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@535 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-22 23:10:25 +00:00
sezero
fea1ba3030 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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@534 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-22 21:55:48 +00:00
sezero
3790bb0ea2 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: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@533 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2011-12-22 21:20:19 +00:00