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

1019 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ozkan Sezer
3062b81726 menu.c (m_return_state): changed type to m_state_e 
(m_quit_prevstate): Likewise.
menu.h (m_return_state): added extern declaration.
net_dgrm.c (m_return_state): removed extern declaration.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@172 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-31 09:15:50 +00:00
Ozkan Sezer
b034275af4 cvar.c (Cvar_RegisterVariable): change the callback function argument type 
to cvarcallback_t.
cvar.h (Cvar_RegisterVariable): adjust prototype.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@171 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-31 08:01:29 +00:00
Ozkan Sezer
c24d592580 host_cmd.c, console.c, gl_draw.c, image.c, gl_model.c, r_sprite.c, cl_parse.c, 
gl_warp.c, host.c, gl_mesh.c, gl_sky.c, gl_texmgr.c, cvar.c, sv_main.c, cvar.h,
gl_screen.c, r_brush.c, gl_vidsdl.c, zone.c, cl_main.c, cmd.c, snd_dma.c,
snd_mem.c, common.c, sv_phys.c: Added explicit casts to eliminate -Wc++-compat
warnings.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@170 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-31 07:42:36 +00:00
Ozkan Sezer
def1c058f4 keys.c (Key_SetBinding): Avoid the C++ keyword "new". 
pr_cmds.c (PF_normalize, PF_vlen): Likewise.
zone.c (Z_TagMalloc, Cache_Move, Cache_TryAlloc): Likewise.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@169 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-31 06:39:09 +00:00
Ozkan Sezer
1bdb202ef8 gl_mesh.c: Change the type of used[] array from qboolean to int, because 
it is assigned not just true or false values but other integers like "2"
as well, and it would cause a mess if compiled as a C++ source.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@168 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-31 06:27:56 +00:00
Ozkan Sezer
b2322815ca MacOSX/QuakeSpasm.xcodeproj/ 
Updated XCode project files from Levent Yavas.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@167 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-21 19:03:17 +00:00
Ozkan Sezer
8ee760abc8 sys_sdl.c (Sys_Error): Call Host_Shutdown(). 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@166 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-18 14:15:19 +00:00
Ozkan Sezer
61ff367eee quakedef.h: bumped QuakeSpasm version to 3 (0.85.3) for further development 
and future releases.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@165 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-03 15:28:18 +00:00
Steven
bcc52d9c82 Fix mouse release issue after toggling fullscreen 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@163 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-05-02 02:22:24 +00:00
Ozkan Sezer
7f7fdb596d host_cmd.c (Host_Startdemos_f): Add missing linefeed in Cbuf_InsertText() call. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@162 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-28 06:42:09 +00:00
Ozkan Sezer
bb18b7dd41 gl_vidnt.c, gl_vidsdl.c: if 0'ed out unused CheckArrayExtensions(). 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@161 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-27 12:40:19 +00:00
Ozkan Sezer
9501dc2bf6 sys.h, sys_sdl.c: Removed unused Sys_MakeCodeWriteable and Sys_DebugLog. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@160 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-27 12:37:20 +00:00
Ozkan Sezer
c2c768f028 console.c: Added LOG_Init() and LOG_Close() as two new procedures, adapted 
from uhexen2. Moved debug log initialization from Con_Init() to LOG_Init().
Made Con_DebugLog() to operate without varargs stuff. Log file is written
into host_parms->basedir now, not into a gamedir.
console.h: Added prototypes for LOG_Init() and LOG_Close().
host.c (Host_Init): Added LOG_Init().
(Host_Shutdown): Added LOG_Close().
quakedef.h (quakeparms_t): Moved the typedef to an earlier place before
any of the other quake headers are included.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@159 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-27 08:24:13 +00:00
Ozkan Sezer
65a7f903e5 main_sdl.c (main): Remove leading linefeed from the init message. 
common.c (COM_InitArgv): Move the leading linefeed to the end of message.

Index: main_sdl.c
===================================================================
--- main_sdl.c	(revision 157)
+++ main_sdl.c	(working copy)
@@ -58,7 +58,7 @@
 	if (!parms.membase)
 		Sys_Error ("Not enough memory free; check disk space\n");
 
-	Con_Printf("\nFitzQuake %1.2f (c) John Fitzgibbons\n", FITZQUAKE_VERSION);
+	Con_Printf("FitzQuake %1.2f (c) John Fitzgibbons\n", FITZQUAKE_VERSION);
 	Con_Printf("SDL port (c) Sleepwalkr, Baker\n");
 	Con_Printf("QuakeSpasm %1.2f.%d (c) Ozkan Sezer, Stevenaaus\n", FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH);
 
Index: common.c
===================================================================
--- common.c	(revision 157)
+++ common.c	(working copy)
@@ -1150,7 +1150,7 @@
 	if (n > 0 && com_cmdline[n-1] == ' ')
 		com_cmdline[n-1] = 0; //johnfitz -- kill the trailing space
 
-	Con_Printf("\nCommand line: %s",com_cmdline);
+	Con_Printf("Command line: %s\n", com_cmdline);
 
 	safe = false;
 


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@158 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-27 07:15:19 +00:00
Ozkan Sezer
72cae1fef7 host_cmd.c (Host_Mapname_f): Simplified map name retrieval. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@157 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 21:16:50 +00:00
Ozkan Sezer
ba6f73616b zone.c: A little whitespace tidy-up here and there. 
(hunk_t): Increased name array length to 24. Fixed the strncpy() calls
into that field so that it will be null terminated.
(cache_system_t): Increased name array length to 32.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@156 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 20:40:18 +00:00
Ozkan Sezer
68361d51b1 sys_sdl.c (Sys_Error): made text3, text4 and text5 into const char arrays. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@155 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 16:55:14 +00:00
Ozkan Sezer
53746a85c9 Constified Con_DebugLog, Con_Print, Con_Printf, Con_Warning, Con_DPrintf, 
Con_DPrintf2, Con_SafePrintf, Con_CenterPrintf, Con_LogCenterPrint,
Con_NotifyBox, PL_ErrorDialog, PR_RunError, Host_EndGame, Host_Error,
SV_ClientPrintf, SV_BroadcastPrintf, Host_ClientCommands, Sys_DebugLog,
Sys_Error, Sys_Printf, BOPS_Error and va. Added noreturn attribute to
Sys_Error, Sys_Quit, BOPS_Error, PR_RunError, Host_EndGame and Host_Error.
Added format printf attribute to Con_DebugLog, Con_Printf, Con_Warning,
Con_DPrintf, Con_DPrintf2, Con_SafePrintf, Con_CenterPrintf, PL_ErrorDialog,
PR_RunError, Host_EndGame, Host_Error, SV_ClientPrintf, SV_BroadcastPrintf,
Host_ClientCommands, Sys_DebugLog, Sys_Error, Sys_Printf and va. Adjusted
Host_Status_f and NET_Ban_f for the new attributes. Fixed broken format
strings in Con_Dump_f, Mod_LoadTexinfo, PR_AllocStringSlots and FloorDivMod.
Defined __attribute__ macros in quakedef.h so that we don't break non-gcc
compilers.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@154 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 16:30:40 +00:00
Ozkan Sezer
04f7b1589a mathlib.h (VectorNormalizeFast): Use a float/int union instead of type 
punning to avoid strict aliasing violations. the compiler used to emit
a warning from rsprite.c:R_DrawSpriteModel() where the macro is used.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@153 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 14:11:48 +00:00
Ozkan Sezer
4bc2b26e79 r_alias.c (GL_DrawAliasFrame): Initialize vert2 to vert1 when not lerping, 
which avoids a bogus compiler warning.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@152 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 14:02:37 +00:00
Ozkan Sezer
0baa28dbee gl_model.c (Mod_LoadTextures): If lump->filelen == 0, initialize m to NULL 
in order to avoid a bogus compiler warning.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@151 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 13:47:19 +00:00
Ozkan Sezer
adf384e8b9 r_alias.c (GL_DrawAliasFrame): Initialize blend and iblend to 0 when not 
lerping, which avoids a bogus compiler warning.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@150 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 13:44:24 +00:00
Ozkan Sezer
4b4ee0cbe9 gl_vidnt.c (VID_SetMode): Initialize stat to false to avoid a compiler warning. 
Some whitespace tidy-ups all over.
gl_vidsdl.c (VID_SetMode): Likewise.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@149 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 13:41:39 +00:00
Ozkan Sezer
c7dc5d6cbf gl_vidsdl.c (VID_Init): If -height is not specified on the command line, 
initialize height to width*3/4 which avoids a compiler warning.
gl_vidnt.c (VID_Init): Likewise.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@148 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 13:37:56 +00:00
Ozkan Sezer
9f235e0013 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://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@147 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-26 13:33:07 +00:00
Ozkan Sezer
839066ab60 removed net_udp.* from XCode project files. added conback.h to them. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@146 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 21:27:36 +00:00
Ozkan Sezer
d9bba8189a changed SDL conditional in input.h to SDL_MAJOR_VERSION 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@145 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 16:54:55 +00:00
Ozkan Sezer
bbcb0caaaa 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://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@144 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 16:25:08 +00:00
Ozkan Sezer
8c2b5e909c Makefiles: tweaked+tidied the objects (based on uhexen2 makefile.) 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@143 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 15:55:02 +00:00
Ozkan Sezer
eafcf39b85 renamed main.c to main_sdl.c. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@142 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 15:21:59 +00:00
Ozkan Sezer
986fd86c79 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://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@141 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 14:50:18 +00:00
Ozkan Sezer
714cc395cf added conback to windows codeblocks project file. removed gl_test from 
codeblocks project files.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@140 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 14:01:52 +00:00
Ozkan Sezer
7497b2812d added conback.c to XCode project files. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@139 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 13:55:15 +00:00
Ozkan Sezer
59e73c21f4 removed gl_test.c 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@138 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 13:55:00 +00:00
Ozkan Sezer
96d2b006b9 removed macmini.* from the MacOSX XCode project directory. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@137 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 13:47:52 +00:00
Ozkan Sezer
e6968f0d52 added fitzquake085.txt as a reference doc. split fitzquake080.txt into 
the original fitzquake080.txt and fitzquake080sdl.txt.


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


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


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


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@130 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 12:21:14 +00:00
Ozkan Sezer
6f81045e9f 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://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@129 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 11:10:07 +00:00
Ozkan Sezer
8a9230a245 menu.c (M_AdjustSliders): Changed all of the second if conditions to else if. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@128 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-24 11:08:12 +00:00
Ozkan Sezer
be8c131e1a gl_vidsdl.c: minor editing for a little less diff output against gl_vidnt.c. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@127 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-23 10:10:16 +00:00
Ozkan Sezer
0521495d86 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://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@126 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-23 09:50:44 +00:00
Steven
4443dbc333 Change the "screen size" slider to a scale slider 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@125 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-23 09:25:13 +00:00
Steven
1347b1778e Add conback files to *nix codeblocks project 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@124 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-23 09:04:26 +00:00
Ozkan Sezer
a9b408d871 gl_vidsdl.c: fixed copy+paste error from rev. 119. 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@123 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-23 07:25:39 +00:00
Ozkan Sezer
b5e526686d 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://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@122 af15c1b1-3010-417e-b628-4374ebc0bcbd
 2010-04-23 06:55:20 +00:00