Commit graph

146 commits

Author SHA1 Message Date
sezero
6d761aafe8 gl_vidsdl.c (VID_SetMode): If mode setting failed, error out before doing
anything else unnecessary in between.
gl_vidnt.c (VID_SetMode): Likewise.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@147 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-26 13:33:07 +00:00
sezero
fa0abdefdf removed net_udp.* from XCode project files. added conback.h to them.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@146 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 21:27:36 +00:00
sezero
29e7ef959d changed SDL conditional in input.h to SDL_MAJOR_VERSION
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@145 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 16:54:55 +00:00
sezero
eefe96b000 moved BuildKeyMaps(), Key_Map() and key_map[] from keys.c to in_sdl.c.
made key_map[] static to in_sdl.c. moved the relevant prototypes to
input.h for SDL builds only.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@144 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 16:25:08 +00:00
sezero
4295ad9f9b Makefiles: tweaked+tidied the objects (based on uhexen2 makefile.)
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@143 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 15:55:02 +00:00
sezero
24d7cbe9de renamed main.c to main_sdl.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@142 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 15:21:59 +00:00
sezero
fd2f95586d Makefiles: do not rely on /bin/true. define do_strip as a macro for debug and
non-debug cases and use it, instead. (adapted from tyrquake makefile.)


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@141 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 14:50:18 +00:00
sezero
3381b05750 added conback to windows codeblocks project file. removed gl_test from
codeblocks project files.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@140 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 14:01:52 +00:00
sezero
4dd3d91a86 added conback.c to XCode project files.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@139 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 13:55:15 +00:00
sezero
cd1b95ad90 removed gl_test.c
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@138 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 13:55:00 +00:00
sezero
2cdc2146b6 removed macmini.* from the MacOSX XCode project directory.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@137 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 13:47:52 +00:00
sezero
fe91b2680f added fitzquake085.txt as a reference doc. split fitzquake080.txt into
the original fitzquake080.txt and fitzquake080sdl.txt.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@136 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 13:32:50 +00:00
sezero
dc1d341a73 updated to Steven's new icon.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@135 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 12:55:10 +00:00
sezero
03761c9528 deleted fitzquake512.tga
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@134 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 12:50:52 +00:00
sezero
7798b0b5e2 renamed several Fitzquake.* files to QuakeSpasm.* and adjusted the places
where they are referenced.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@133 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 12:48:09 +00:00
sezero
ec070a1f40 renamed several Fitzquake.* files to QuakeSpasm.* and adjusted the places
where they are referenced.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@132 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 12:45:12 +00:00
sezero
dd4f1dd96a deleted Fitzquake.depend from the codeblocks project directories.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@131 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 12:22:25 +00:00
sezero
aa8d0efbf2 deleted fitzquake.bmp, fitz_bmp.h and fitzquake.ico, removed their reference
from the relevant source files.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@130 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 12:21:14 +00:00
sezero
e29ba6238c gl_vidsdl.c, gl_vidnt.c: more sync'ing between gl_vidsdl.c and fitz-0.85
version of gl_vidnt.c.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@129 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 11:10:07 +00:00
sezero
9eabbc1b14 menu.c (M_AdjustSliders): Changed all of the second if conditions to else if.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@128 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-24 11:08:12 +00:00
sezero
278a0e4d49 gl_vidsdl.c: minor editing for a little less diff output against gl_vidnt.c.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@127 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 10:10:16 +00:00
sezero
3df0b9927d gl_vidnt.c (GL_MTexCoord2fFunc, GL_SelectTextureFunc): these aren't externs
in this file. made it to look like gl_vidsdl.c.
glquake.h: removed commented out multitexture stuff.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@126 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 09:50:44 +00:00
stevenaaus
7334c743a0 Change the "screen size" slider to a scale slider
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@125 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 09:25:13 +00:00
stevenaaus
76bcad2d2b Add conback files to *nix codeblocks project
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@124 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 09:04:26 +00:00
sezero
d7c4af2298 gl_vidsdl.c: fixed copy+paste error from rev. 119.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@123 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 07:25:39 +00:00
sezero
373875ec4a gl_vidsdl.c (VID_Restart): make sure that scr_conscale.value is positive
in conwidth and conheight recalculation (fitzquake-0.85 change).


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@122 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 06:55:20 +00:00
sezero
8c1d892b4a gl_vidsdl.c (VID_Menu_RebuildBppList): if there are no valid fullscreen
bpps for this width/height, just pick one (fitzquake-0.85 change).


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@121 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 06:52:27 +00:00
sezero
77f510e772 gl_vidsdl.c: Several Cvar_Set weirdness tidy-ups from fitzquake-0.85.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@120 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 06:48:36 +00:00
sezero
15586ec7a6 gl_vidsdl.c: Several Con_Printf("WARNING: ....") to Con_Warning("....")
changes from fitzquake-0.85.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@119 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 06:43:24 +00:00
sezero
97d314f0fc sv_main.c (localmodels): Bumped array size from 5 to 6 in order for it
to operate correctly with the raised limits of fitzquake-0.85.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@118 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-23 06:24:51 +00:00
sezero
f8a5363bfd make the code to compile with -fno-common flag:
glquake.h (dev_stats): Add extern.
(dev_peakstats): Likewise.
(dev_overflows): Likewise.
(lightmap_textures): Likewise.
(gl_warpimagesize): Likewise.
(r_drawflat_cheatsafe): Likewise.
(r_fullbright_cheatsafe): Likewise.
(r_lightmap_cheatsafe): Likewise.
(r_drawworld_cheatsafe): Likewise.
gl_texmgr.h (notexture): Likewise.
(nulltexture): Likewise.
(d_8to24table): Likewise.
(d_8to24table_fbright): Likewise.
(d_8to24table_nobright): Likewise.
(d_8to24table_conchars): Likewise.
(d_8to24table_shirt): Likewise.
(d_8to24table_pants): Likewise.
gl_screen.c (sb_lines): Remove and make it live only in sbar.c.
(vid): Remove and make it live only in gl_vid*.c
gl_vidsdl.c (m_state): Remove and make it live only in menu.c.
gl_vidnt.c (m_state): Likewise.
net_dgrm.c (m_state): Remove extern declaration.
menu.c (m_state): Tagged the m_state enum as m_state_e and moved it to menu.h.
Declared m_state as enum m_state_e.
menu.h (enum m_state_e): Moved from menu.c to here.
(m_state): Added extern declaration.
gl_rmain.c (r_drawflat_cheatsafe): Made the global to live here.
(r_fullbright_cheatsafe): Likewise.
(r_lightmap_cheatsafe): Likewise.
(r_drawworld_cheatsafe): Likewise.
gl_warp.c (gl_warpimagesize): Likewise.
host.c (dev_stats): Likewise.
(dev_peakstats): Likewise.
(dev_overflows): Likewise.
gl_texmgr.c (notexture): Likewise.
(nulltexture): Likewise.
(d_8to24table): Likewise.
(d_8to24table_fbright): Likewise.
(d_8to24table_nobright): Likewise.
(d_8to24table_conchars): Likewise.
(d_8to24table_shirt): Likewise.
(d_8to24table_pants[): Likewise.
r_brush.c (lightmap_textures): Likewise.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@117 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-22 19:02:29 +00:00
sezero
4549e5a97c menu.c (M_Quit_Draw): updated the authors string and tweaked the string
length calculation by dropping some sprintf() and strlen() calls.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@116 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-22 18:32:26 +00:00
sezero
ccfe4701e4 set properties for Makefile.darwin.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@115 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-22 17:25:49 +00:00
stevenaaus
4270587d5e Add OSX makefile
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@114 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-22 00:30:57 +00:00
stevenaaus
1ddaa2c97e Make conspeed cvar persistent
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@113 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-22 00:27:14 +00:00
stevenaaus
4fad37c3e7 A few QuakeSpasm name fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@112 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-04-22 00:25:31 +00:00
sezero
fc6fc9cf95 New quakespasm icon from Steven.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@111 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-27 13:50:43 +00:00
sezero
f3bf597c12 sv_main.c (SV_SpawnServer): made the dummy array 8 bytes long.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@110 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-09 14:15:34 +00:00
sezero
9919f2dbc8 Don't explicitly expose pr_strings to the whole engine, make it static
to pr_edict.c. Assign a static array of zeroes to sv.model_precache[0]
and sv.sound_precache[0], instead of pr_strings, in sv_main.c.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@109 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-09 14:11:10 +00:00
sezero
f252dba2f8 zone.c (Z_Realloc): Fixed the old_size value.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@108 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-09 12:03:08 +00:00
sezero
12dfc720c4 gl_vidsdl.c (VID_Init): Removed the gldir variable, not used anymore.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@107 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-07 07:35:39 +00:00
sezero
a1f4730338 gl_vidsdl.c (VID_Init): Removed creation of the 'glquake' directory. Not
used for quite some time.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@106 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-07 07:27:54 +00:00
sezero
66a046a809 net_dgrm.c (Strip_Port): rewrote it to not modify its input string and
return its own copy, which I feel safer with. Adjusted its callers.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@105 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-06 21:03:03 +00:00
sezero
50df0eeb00 det_dgrm.c (_Datagram_Connect): Added error feedback when we could not
resolve the given host name.
(Test_f): Likewise.
(Test2_f): Likewise.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@104 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-06 14:20:46 +00:00
sezero
08a2938f65 det_dgrm.c (Strip_Port): New proc stripping off port from the given host
name and assining the new port number to net_hostport. based on ProQuake
code. This makes a command line like "+connect ip:port" work.
(Test_f): Call Strip_Port().
(Test2_f): Likewise.
(Datagram_Connect): Likewise.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@103 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-06 14:10:37 +00:00
sezero
f81bcce75c common.c (COM_Parse): commented out the check for ':' in regular word parsing
so that a command line like "+connect ip:port2 works.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@102 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-06 13:35:05 +00:00
sezero
ef5d5481aa net_dgrm.c (_Datagram_Connect): fix the printf call in the CCREP_REJECT case.
manually null terminate the reason string buffer.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@101 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-06 10:48:18 +00:00
sezero
b40b2f958b net_sdlnet.c (SDLN_GetAddrFromName): use net_hosport instead of hardcoded
26000 in the SDLNet_ResolveHost() call.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@100 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-06 10:29:43 +00:00
stevenaaus
15d39fa705 S.A. history fixes
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@99 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-05 22:12:23 +00:00
sezero
9f4bb6b578 cl_main.c (CL_EstablishConnection): Send a clc_nop at the end of the function.
This has been referred to by Baker as the NAT fix of ProQuake. Applied upon
Steven's suggestion and it made me able to connect to bigfoot.quake1.net:26001
too.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@98 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-03-05 16:11:06 +00:00