fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
92 Commits 51 Branches 7 Tags 218 MiB
Commit Graph

92 Commits

Author SHA1 Message Date
sezero 5f8c86f77e gl_screen.c (SCR_ScreenShot_f): Changed screenshot name to spasmXXXX.tga 
as suggested by Piotr Szymaniak.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@94 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-03-01 11:35:28 +00:00
sezero ea9ce64768 console.c (BuildMapList, Con_TabComplete): fix sporadic erratic behaviour 
with map name completion. from Steven.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@93 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-03-01 10:44:59 +00:00
sezero d100f32fc0 common.c (va): made va() to cycle between four static buffers so that we 
can call it one after another. will be needed later.
(get_va_buffer): new helper for va().


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@92 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-03-01 10:28:12 +00:00
sezero 90204323c7 quakedef.h: incremented QuakeSpasm version to 0.2 (0.85.2) 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@91 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-27 09:32:44 +00:00
sezero 300265142c host_cmd.c (ExtraMaps_Add): Fix the list sorting. 
(Modlist_Add): Likewise.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@90 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-27 09:03:22 +00:00
sezero 4fe4cb3ea1 host_cmd.c (Modlist_Init): fix the return value check for Q_strcasecmp(). 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@89 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-27 08:58:54 +00:00
sezero 82aecaa4f5 host_cmd.c (Host_InitCommands): register Host_Mods_f as "games" too, as an 
alias to the existing "mods" command. (this was unintentionally applied in
revision 87, sigh...)


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@88 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-27 08:05:36 +00:00
sezero 1fbf28737e common.c (Q_strncasecmp): fix it so that it properly returns negative and 
positive values.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@87 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-27 08:00:57 +00:00
sezero bae0122b7a sys_sdl.c: implemented Sys_mkdir. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@86 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-27 07:47:16 +00:00
sezero 75f1f1cb5c sys_sdl.c: renamed filelength to Sys_filelength in order to avoid conflicts 
when compiling for windows.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@85 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-27 07:45:12 +00:00
sezero 1f4fbfe833 bspfile.h, cdaudio.h, client.h, cmd.h, common.h, console.h, crc.h, cvar.h, 
d_ifacea.h, draw.h, gl_texmgr.h, glquake.h, image.h, input.h, keys.h, mathlib.h,
menu.h, modelgen.h, net.h, net_dgrm.h, net_loop.h, net_sdlnet.h, net_udp.h,
net_wins.h, platform.h, pr_comp.h, progdefs.h, progs.h, protocol.h, quakedef.h,
render.h, resource.h, sbar.h, screen.h, server.h, sound.h, spritegn.h, sys.h,
vid.h, view.h, wad.h, world.h, zone.h: added include guards to the headers.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@84 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-21 00:01:08 +00:00
sezero ad054ac5e9 fitzquake.bmp: added new miage file (24 bit, 32*32, converted from 
fitzquake.ico)
fitz_bmp.h: new header, dumped bytes from fitzquake.bmp.
pl_linux.c (PL_SetWindowIcon): implemented window icon.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@82 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 21:23:09 +00:00
sezero 63211ba900 fitzquake.bmp: added new miage file (24 bit, 32*32, converted from 
fitzquake.ico)
fitz_bmp.h: new header, dumped bytes from fitzquake.bmp.
pl_linux.c (PL_SetWindowIcon): implemented window icon.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@81 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 21:14:46 +00:00
sezero d44053c8bf pl_linux.c (PL_ErrorDialog): print to stderr. append a '\n' to the message. 
updated the todo note.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@80 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 21:04:29 +00:00
sezero 3e0d921c81 gray_big.bmp, gray_big.lmp: added custom conback image files for QuakeSpasm. 
mk_header.c : added tiny C source to generate conback.h header from the lmp.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@79 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 12:01:01 +00:00
sezero fd96167e0a made loading of embedded custom conback friendly with dynamic gamedirs: 
gl_draw.c (Draw_CheckConback): new proc.
 (Draw_Init): moved mod-provided gfx/conback.lmp check form here to
Draw_CheckConback().
draw.h (Draw_CheckConback): added prototype.
gl_texmgr.c (TexMgr_NewGame): call Draw_CheckConback().


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@78 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 09:55:32 +00:00
sezero a39769329c gl_draw.c: search for a mod-provided conback image in Draw_Init time 
and cache the result, instead of doing it everytime.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@77 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 09:30:14 +00:00
sezero e76b9c7050 the custom embedded comback image is intended to replace the id1 image .. 
* .. when running in fitz-compatibility mode (-fitz command line switch)
* .. or when the mods themselves did not provide their own conback image
themselves, ie. the "Q" conback image of id1 is just not wanted. So, just
modify/corrupt the gfx/conback.lmp filename in the id1/pak0.pak file list,
achieving the intention that way.
common.c (kill_id1_conback): new QuakeSpasm customization helper.
 (COM_InitFilesystem): call kill_id1_conback() just after adding the id1
directory to the search path when not running in fitzmode.
gl_draw.c (Draw_ConbackPic): when not running in fitzmode, do search for
the gfx/conback.lmp file before loading the embedded custom image to see
whether the mod provided its own conback image.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@76 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 08:50:31 +00:00
sezero a759b9f4eb console.c (Con_TabComplete): added a workaround after the weirdness that has 
been happening with the argument completion for the changelevel command after
the completion changes. from Steven.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@75 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 08:29:48 +00:00
sezero 7a3e347d0a common.c (COM_FindFile): commented out the debug messages about finding 
and not finding a file.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@74 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 08:20:20 +00:00
sezero 8fe8478be1 common.c (COM_Init): move the -fitz command line switch check before the 
filesystem initialization.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@73 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 08:14:30 +00:00
sezero 2f4ed3f283 host_cmd.c (Host_Changelevel_f): activate mouse input upon changelevel. 
(from Steven.)


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@72 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 01:20:45 +00:00
sezero f2f3f1aff7 cl_main.c (CL_NextDemo): fix for an obscure bug when there are no demos 
listed with startdemos: run the game, go into a savegame or start a new
game, type F3 and press Esc enough times to go back to normal view, bring
down the console and enter "timedemo demo1". when the demo ends, the only
thing I was able to *see* was the loading label, no other activity at all,
although I can still do F10 (quit) and blindly press Y to exit the game,
so the engine didn't crash. problem was that CL_NextDemo() didn't check
if an actual nextdemo exists before calling SCR_BeginLoadingPlaque() which
set scr_drawloading to true, so scr_drawloading still remained as true..
fixed thusly.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@71 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 01:10:18 +00:00
sezero 593549a0c4 snd_mix.c (SND_InitScaletable): fixed the snd_scaletable init breakage with 
gcc-4.1 and -O1 and higher From Kevin Shanahan (Tyrann). although the bug is
fixed in gcc, it is safer to have this workaround here.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@70 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 00:25:33 +00:00
sezero 0378a0b575 gl_model.c (Mod_LoadModel): buf needn't be an unsigned int pointer, made 
it into a byte pointer, extracted the mod type from the header by bit shifts.
also removed the unnecessary void pointer variable.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@69 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 00:20:08 +00:00
sezero a3dccdfe76 gl_rmisc.c (R_Envmap_f): the envmap command can only be run when there's something 
to render, ie. when connected to a server. besides, the refdef must be restored when
it is completed.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@68 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 00:05:14 +00:00
sezero ee309ae2fd pr_exec.c (PR_Profile_f): the profile command can only be run when the server is active. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@67 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-20 00:00:40 +00:00
sezero 2afebd8dc1 cmd.c (Cbuf_Execute), net_dgrm.c (Datagram_GetMessage), net_loop.c (Loop_GetMessage): 
replaced memcpy calls for overlapping areas with memmove().


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@66 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 23:55:17 +00:00
sezero 11614c482b console.c: Steven's patch adding argument completion to map and changelevel 
commands.  this is not a true argument completion, only a tiny hack for the
two aforementioned commands.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@65 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 16:35:13 +00:00
sezero ebb08e594b console.c: Steven's patch making console command completion display a little 
more like bash, showing the maximum matching partial at the first time instead
of auto-completing to the first match.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@64 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 16:28:41 +00:00
sezero 5ffba633f4 gl_vidsdl.c (VID_Toggle): removed extra failure message (left over from commit r62). 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@63 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 16:18:24 +00:00
sezero 194211a73b gl_vidsdl.c (VID_Toggle): made it so that when SDL_WM_ToggleFullScreen() fails, 
a VID_Restart will be attempted (hoping ~that~ will succeed..)


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@62 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 16:03:45 +00:00
sezero df060bf72b use Steven's patch andallow for the 'demos' command to work in !fitzmod : 
host_cmd.c (Host_Startdemos_f): reverted rev.50 change. when not fitzmode,
made it to directly go to the menu instead CL_NetxDemo().
menu.c (M_Main_Key): when not fitzmode, do not CL_NextDemo() for K_ESCAPE
case.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@61 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 13:32:21 +00:00
sezero a15c8c8bbe updated the copyleft file from ftp://ftp.gnu.org/gnu/Licenses/COPYING-2.0 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@60 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 12:40:45 +00:00
sezero f5a26bd25d removed the 9.5 MB Icon.psd file. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@59 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 12:20:09 +00:00
sezero d150ed473f menu.c (OPTIONS_ITEMS): keep as 13 and don't define as 14 for windows, 
because the SDL port seems to have removed the "use mouse" entry in the
options menu.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@58 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 11:55:21 +00:00
sezero d5446a5a81 console.c (Con_TabComplete): check for key_tabpartial[0] instead of strlen(key_tabpartial). 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@57 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-19 09:15:23 +00:00
sezero 3766cbbb92 gl_draw.c: fixed several strict aliasing violations about glpic_t. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@56 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 22:11:26 +00:00
sezero 80346daacf Makefile.w32, Makefile.w64: now that net_sdlnet.c is properly cleaned up 
and is not messing with socket api functions, windows versions no longer
need linking to wsock32.dll or ws2_32.dll.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@55 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 22:02:13 +00:00
sezero 28fe359668 net_sdlnet.c: cleanup and warning fixes: automatic changing of the "hostname" 
cvar according to internet hostname has been removed. SDL_net doesn't provide
and equivalent of gethostname() and mixing APIs is not a good idea. servers
will be called "UNNAMED" if they don't set it themselves. Also removed the
inet_addr("127.0.0.1") call and replaced it with SDL_SwapBE32(INADDR_LOOPBACK).
defined INADDR_LOOPBACK as 0x7f000001 if not already defined. properly guarded
the AF_INET and MAXHOSTNAMELEN definitions to be on the safe side. replaced
all variables named 'socket' to 'socket_p' so as to avoid confusions with the
socket api. fixed two strict aliasing violations in SDLN_OpenSocket() and
SDLN_GetSocketAddr().


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@54 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 21:56:10 +00:00
sezero 1b4449d7b5 gl_draw.c (Draw_ConbackPic): new proc for drawing the normal conback image 
in fitzmode mode otherwise drawing the custom QuakeSpasm conback from memory.
(Draw_ConsoleBackground): use the new Draw_ConbackPic().
Makefile, Makefile.w32, Makefile.w64: added conback.c to the build.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@53 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 16:55:28 +00:00
sezero 527ca95074 conback.c, conback.h: added new QuakeSpasm conback data. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@52 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 16:45:28 +00:00
sezero 85046bb7ef draw.h, gl_draw.c, gl_vidsdl.c: removed my recently added Draw_ClearMenuPicCache() 
helper. not necessary at all.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@51 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 16:00:34 +00:00
sezero 04dc181de1 Steven's customizations: 
host_cmd.c (Host_Startdemos_f): if not running in fitzmode, don't add demos
to the loop and set cls.demonum.to -1.
menu.c (M_Draw): if not running in fitzmode, quit immediately without the
dialog for the m_quit case.
sbar.c (Sbar_SoloScoreboard): restored the original behavior depending on
whether we are running in fitzmode.
Marked the code with /* QuakeSpasm customization: */ in those places.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@50 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 12:55:19 +00:00
sezero a6161368ad Makefile, Makefile.w32, Makefile.w64: renamed the binary name to quakespasm[.exe] 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@49 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 12:14:51 +00:00
sezero bf422e326a common.c (COM_Init): updated endianism check. 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@48 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 12:00:31 +00:00
sezero 5c82cc37e1 common.c, common.h: added check for '-fitz' command line switch which, if true, 
makes quakespasm to run in fitzquake mode and disable custom quakespasm hacks.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@47 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 11:45:18 +00:00
sezero a44e7d568f in_sdl.c: made total_dx, total_dy and FilterMouseEvents() static. added 
a boolean no_mouse. added check for '-nomouse' command line switch which
disables all mouse events.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@46 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 11:33:12 +00:00
sezero abb5c83898 main.c (main): Fixed the utterly broken SDL active event mask usage. In 
its original form, gcc rightfully considered that case a dead code even
when not optimizing. Commented out the contents of the case for now.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@45 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-18 10:33:33 +00:00
sezero 9e69266a5d gl_vidsdl.c (VID_MenuKey): fixed a typo: cursor position 4 controls vid_vsync, 
not vid_fullscreen.


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@44 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-02-17 23:37:24 +00:00