TW config changes

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5636 fc73d0e0-1445-4013-8a0c-d673dee63da5

engine/common/config_wastes.h

@@ -4,7 +4,7 @@
 *
 ****/
 
-/* Branding Defaults */
+/* branding defaults */
 #define DISTRIBUTION "VTW"
 #define DISTRIBUTIONLONG "Vera Visions"
 #define FULLENGINENAME "The Wastes"
@@ -17,75 +17,86 @@
 #define GAME_BASEGAMES		"logos","wastes"
 #define GAME_PROTOCOL		"The-Wastes"
 #define GAME_DEFAULTPORT	23000
-//#define GAME_IDENTIFYINGFILES	NULL	//with multiple games, this string-list gives verification that the basedir is actually valid. if null, will just be assumed correct.
-//#define GAME_DOWNLOADSURL	NULL	//url for the package manger to update from
-//#define GAME_DEFAULTCMDS	NULL	//a string containing the things you want to 
-
-/* Engine-side, fast routing */
-#define ENGINE_ROUTING
-
-/* Native menu replacing menuQC, will debut eventually */
-#undef MENU_NATIVECODE
 
 #ifndef GLQUAKE
 #define GLQUAKE
 #endif
 
+/*
 #ifndef VKQUAKE
 #define VKQUAKE
 #endif
+*/
+#undef VKQUAKE /* not yet, needs more testing */
 
-#define PLUGINS
+ /* disable quake specific hacks and overrides */
 #define QUAKETC
-#define AVAIL_OPENAL
+#define NOBUILTINMENUS
-#define AVAIL_ZLIB
+#define NOLEGACY
-#define AVAIL_OGGVORBIS
+
-#define IMAGEFMT_PCX
+/* engine behaviour */
-#define CL_MASTER
+#define PLUGINS /* enables fteplug_ files */
-#define CSQC_DAT
+#define AVAIL_ZLIB /* we need this for pk3 and ogg vorbis */
-#define MENU_DAT
+#define CL_MASTER /* allows for serverbrowser builtins */
-#define PSET_SCRIPT
+#define CSQC_DAT /* clientside qcvm */
-#define VOICECHAT
+#define MENU_DAT /* persistent qcvm */
-#define RTLIGHTS
+#define PSET_SCRIPT /* scripts defining particles */
-#define LOADERTHREAD
+#define RTLIGHTS /* only way FTE does dlights on Q3BSP basically */
-#define USEAREAGRID
+#define LOADERTHREAD /* multithreading related */
-#define USERBE
+#define USEAREAGRID /* leave it on, improves performance */
-#define IMAGEFMT_DDS
+#define AVAIL_DINPUT /* input for Windows */
+#define AVAIL_FREETYPE	/* for truetype font rendering */
+#define AVAIL_STBI /* avoid libpng/libjpeg dependancies */
+#define ENGINE_ROUTING /* engine-side, fast routing */
+
+/* uncompressed textures */
+#define IMAGEFMT_BMP /* sprays */
+#define IMAGEFMT_TGA /* disable for RELEASE? */
+
+/* compressed textures */
+#define IMAGEFMT_DDS 
 #define DECOMPRESS_ETC2
 #define DECOMPRESS_RGTC
 #define DECOMPRESS_S3TC
-#define DECOMPRESS_BPTC			//bc6+bc7
+
-#define NOBUILTINMENUS
+/* To be able to comm with Frag-Net.com */
-#define NOLEGACY
-#define AVAIL_DINPUT
-#define IMAGEFMT_BMP
-#define HAVE_TCP
 #define HAVE_PACKET
 #define SUPPORT_ICE
+#define HAVE_TCP
+#define HAVE_GNUTLS /* linux tls/dtls support */
+#define HAVE_WINSSPI /* windows tls/dtls support */
 
 #ifndef MULTITHREAD
 #define MULTITHREAD
 #endif
 
 #ifndef DEBUG
-#define NOQCDESCRIPTIONS 2 //if 2, disables writing fteextensions.qc completely.
+/* if 2, disables writing fteextensions.qc completely. */
+#define NOQCDESCRIPTIONS 2
 #endif
 
-// Various package formats
+/* various package formats */
 #define PACKAGE_PK3
 #define PACKAGE_TEXWAD
 #define PACKAGE_Q1PAK
 
-// Map formats
+/* level formats */
 #define Q3BSPS
 #define Q1BSPS
 #define TERRAIN
 
-// Model formats, IQM/VVM and HLMDL for legacy maps
+/* audio */
+#define AVAIL_OPENAL
+#define AVAIL_OGGVORBIS
+#define HAVE_OPUS
+#define VOICECHAT
+
+/* Model formats, IQM/VVM and HLMDL for legacy maps */
 #define INTERQUAKEMODELS
 #define HALFLIFEMODELS
 
-// What do we NOT want to use
+/* we don't need any of these */
+#undef IMAGEFMT_PCX
 #undef USE_INTERNAL_BULLET
 #undef USE_INTERNAL_ODE
 #undef PACKAGE_DOOMWAD
@@ -104,104 +115,97 @@
 #undef ZYMOTICMODELS
 #undef DPMMODELS
 #undef PSKMODELS
-
+#undef MENU_NATIVECODE	/* native menu replacing menuQC */
-#undef MVD_RECORDING //server can record MVDs.
+#undef MVD_RECORDING	/* server can record MVDs. */
-#undef D3D9QUAKE
+#undef D3D9QUAKE	/* MICROS~1 trash */
-#undef D3D11QUAKE
+#undef D3D11QUAKE	/* MICROS~1 trash */
-#undef D3D8QUAKE
+#undef D3D8QUAKE	/* MICROS~1 trash */
-#undef AVAIL_WASAPI	//windows advanced sound api
+#undef AVAIL_WASAPI	/* windows advanced sound api */
-#undef AVAIL_DSOUND
+#undef AVAIL_DSOUND	/* MICROS~1 trash */
-#undef BOTLIB_STATIC	//q3 botlib
+#undef BOTLIB_STATIC	/* q3 botlib */
-#undef AVAIL_XZDEC	//.xz decompression
+#undef AVAIL_XZDEC	/* .xz decompression */
-#undef HAVE_SPEEX	//.xz decompression
+#undef HAVE_SPEEX	/* .xz decompression */
-#undef AVAIL_GZDEC	//.gz decompression
+#undef AVAIL_GZDEC	/* .gz decompression */
-#undef PACKAGE_DZIP	//.dzip special-case archive support
+#undef PACKAGE_DZIP	/* .dzip special-case archive support */
-#undef AVAIL_PNGLIB	//.png image format support (read+screenshots)
+#undef AVAIL_PNGLIB	/* .png image format support (read+screenshots) */
-#undef AVAIL_JPEGLIB	//.jpeg image format support (read+screenshots)
+#undef AVAIL_JPEGLIB	/* .jpeg image format support (read+screenshots) */
-#undef AVAIL_MP3_ACM	//.mp3 support (in windows).
+#undef AVAIL_MP3_ACM	/* .mp3 support (in windows). */
 #undef IMAGEFMT_KTX
 #undef IMAGEFMT_PKM
-#undef IMAGEFMT_BLP	//legacy crap
+#undef IMAGEFMT_BLP
-#undef IMAGEFMT_VTF	//legacy crap
+#undef IMAGEFMT_VTF
-#undef NETPREPARSE	//allows for running both nq+qw on the same server (if not, protocol used must match gamecode).
+#undef NETPREPARSE	/* allows for running both nq+qw on the same server (if not, protocol used must match gamecode) */
-#undef USE_SQLITE	//sql-database-as-file support
+#undef USE_SQLITE	/* sql-database-as-file support */
-#undef QUAKESTATS	//defines STAT_HEALTH etc. if omitted, you'll need to provide that functionality yourself.
+#undef QUAKESTATS	/* defines STAT_HEALTH etc. if omitted, you'll need to provide that functionality yourself */
-#undef QUAKEHUD		//support for drawing the vanilla hud.
+#undef QUAKEHUD		/* support for drawing the vanilla hud */
-#undef QWSKINS		//disabling this means no qw .pcx skins nor enemy/team skin/colour forcing
+#undef QWSKINS		/* disabling this means no qw .pcx skins nor enemy/team skin/colour forcing */
-#undef SVRANKING	//legacy server-side ranking system.
+#undef SVRANKING	/* legacy server-side ranking system */
-#undef RAGDOLL		//ragdoll support. requires RBE support.
+#undef USERBE 		/* required for physics */
-#undef HUFFNETWORK	//crappy network compression. probably needs reseeding.
+#undef RAGDOLL		/* ragdoll support. requires RBE support */
-#undef SVCHAT		//ancient lame builtin to support NPC-style chat...
+#undef HUFFNETWORK	/* crappy network compression. probably needs reseeding */
-#undef VM_Q1		//q1qvm implementation, to support ktx.
+#undef SVCHAT		/* ancient lame builtin to support NPC-style chat.. */
-#undef Q2SERVER		//q2 server+gamecode.
+#undef VM_Q1		/* q1qvm implementation, to support ktx */
-#undef Q2CLIENT		//q2 client. file formats enabled separately.
+#undef Q2SERVER		/* q2 server+gamecode */
-#undef Q3CLIENT		//q3 client stuff.
+#undef Q2CLIENT		/* q2 client. file formats enabled separately */
-#undef Q3SERVER		//q3 server stuff.
+#undef Q3CLIENT		/* q3 client stuff */
-#undef HEXEN2		//runs hexen2 gamecode, supports hexen2 file formats.
+#undef Q3SERVER		/* q3 server stuff */
-#undef NQPROT		//act as an nq client/server, with nq gamecode.
+#undef HEXEN2		/* runs hexen2 gamecode, supports hexen2 file formats */
-////#undef WEBSERVER	//sv_ftp + sv_http cvars.
+#undef NQPROT		/* act as an nq client/server, with nq gamecode */
-#undef WEBCLIENT	//uri_get+any internal downloads etc
+#undef WEBSERVER	/* sv_ftp + sv_http cvars */
-#undef RUNTIMELIGHTING	//automatic generation of .lit files
+#undef WEBCLIENT	/* uri_get+any internal downloads etc */
-#undef R_XFLIP		//old silly thing
+#undef RUNTIMELIGHTING	/* automatic generation of .lit files */
-#undef TEXTEDITOR	//my funky text editor! its awesome!
+#undef R_XFLIP		/* old silly thing */
-#undef TCPCONNECT	//support for playing over tcp sockets, instead of just udp. compatible with qizmo.
+#undef TEXTEDITOR	/* because emacs */
-#undef IRCCONNECT	//lame support for routing game packets via irc server. not a good idea.
+#undef TCPCONNECT	/* support for playing over tcp sockets, instead of just udp. compatible with qizmo */
-#undef PSET_CLASSIC	//support the 'classic' particle system, for that classic quake feel.
+#undef IRCCONNECT	/* lame support for routing game packets via irc server. not a good idea */
-#undef HAVE_CDPLAYER	//includes cd playback. actual cds. named/numbered tracks are supported regardless (though you need to use the 'music' command to play them without this).
+#undef PSET_CLASSIC	/* support the 'classic' particle system, for that classic quake feel */
-////#undef QTERM
+#undef HAVE_CDPLAYER	/* Redbook CD Audio */
+#undef QTERM
 #undef SIDEVIEWS
 #undef MAX_SPLITS
-#undef SUBSERVERS
+#undef SUBSERVERS		/* multi-map */
-////#undef SV_MASTER
+#undef HAVE_MIXER		/* OpenAL only */
-#undef HAVE_MIXER	//openal only
+#undef VM_LUA			/* lua game-logic */
-#undef VM_LUA
+#undef HLCLIENT			/* regressed, unfinished*/
-#undef HLCLIENT
+#undef HLSERVER			/* regressed, unfinished */
-#undef HLSERVER
 #undef FTPSERVER
-//#undef CLIENTONLY	//leave this up to the makefiles.
+#undef HAVE_JUKEBO		/* includes built-in jukebox */
-#define HAVE_GNUTLS	//linux tls/dtls support
+#undef HAVE_MEDIA_DECODER	/* can play cin/roq, more with plugins */
-#define HAVE_WINSSPI	//windows tls/dtls support
+#undef HAVE_MEDIA_ENCODER	/* capture/capturedemo work */
-#undef HAVE_JUKEBOX	//includes built-in jukebox crap
+#undef HAVE_SPEECHTOTEXT	/* Windows speech-to-text thing */
-#undef HAVE_MEDIA_DECODER	//can play cin/roq, more with plugins
+#undef SAVEDGAMES
-#undef HAVE_MEDIA_ENCODER	//capture/capturedemo work.
+#undef PACKAGEMANAGER		/* enable/disable/download packages and plugins */
-#undef HAVE_SPEECHTOTEXT	//windows speech-to-text thing
-//#define SAVEDGAMES			//Can save the game.
-#undef PACKAGEMANAGER			//Allows the user to enable/disable/download packages and plugins.
 #undef HEADLESSQUAKE
 #undef WAYLANDQUAKE
-#define AVAIL_FREETYPE	// for truetype font rendering
+#undef SERVER_DEMO_PLAYBACK	/* deprecated */
-#undef SERVER_DEMO_PLAYBACK	//outdated crap
+#undef DECOMPRESS_BPTC
-
+#undef HAVE_OPENSSL		/* incomplete */
-//FIXME: Stuff that Spike has added that eukara needs to decide whether to use or not.
+#undef IMAGEFMT_HDR
-#define HAVE_OPUS
+#undef IMAGEFMT_PBM
-#undef HAVE_OPENSSL
+#undef IMAGEFMT_PSD
-//#define IMAGEFMT_HDR
+#undef IMAGEFMT_XCF
-//#define IMAGEFMT_PBM
+#undef IMAGEFMT_LMP
-//#define IMAGEFMT_PSD
+#undef IMAGEFMT_PNG
-//#define IMAGEFMT_XCF			//flattens, most of the time
+#undef IMAGEFMT_JPG
-#define IMAGEFMT_TGA
+#undef IMAGEFMT_GIF
-#define IMAGEFMT_LMP
+#undef IMAGEFMT_EXR
-//#define IMAGEFMT_PNG
+#undef IPLOG
-//#define IMAGEFMT_JPG
+#undef AVAIL_BOTLIB
-//#define IMAGEFMT_GIF
+#undef AVAIL_BZLIB
-//#define IMAGEFMT_EXR			//openexr, via Industrial Light & Magic's rgba api, giving half-float data.
+#undef DECOMPRESS_ASTC
-//#define AVAIL_STBI			//make use of Sean T. Barrett's lightweight public domain stb_image[_write] single-file-library, to avoid libpng/libjpeg dependancies.
+#undef IMAGEFMT_ASTC
-//#define IPLOG
+#undef HAVE_HTTPSV
-//#define AVAIL_BOTLIB
+#undef MODELFMT_MDX
-//#define AVAIL_BZLIB
+#undef MODELFMT_OBJ
-//#define DECOMPRESS_ASTC
+#undef MODELFMT_GLTF
-//#define IMAGEFMT_ASTC
-//#define HAVE_HTTPSV
-//#define MODELFMT_MDX
-//#define MODELFMT_OBJ
-//#define MODELFMT_GLTF			//khronos 'transmission format'. .gltf or .glb extension. PBR. Version 2 only, for now.
 
 #ifdef COMPILE_OPTS
-//things to configure qclib, which annoyingly doesn't include this file itself
+/* things to configure qclib, which annoyingly doesn't include this
--DOMIT_QCC	//disable the built-in qcc 
+ * file itself */
--DSIMPLE_QCVM	//disable qc debugging and 32bit opcodes
+-DOMIT_QCC	/* disable the built-in qcc */
+-DSIMPLE_QCVM	/* disable qc debugging and 32bit opcodes */
 #ifndef AVAIL_ZLIB
--DNO_ZLIB	//disable zlib
+-DNO_ZLIB	/* disable zlib */
 #endif
 #ifdef AVAIL_PNGLIB
 -DLINK_PNG
@@ -213,16 +217,25 @@
 -DLINK_FREETYPE
 #endif
 
-#ifdef USE_INTERNAL_BULLET	//makefile will respond to this by trying to link bullet into the engine itself, instead of as a plugin.
+/* makefile will respond to this by trying to link bullet into the
+ * engine itself, instead of as a plugin. */
+#ifdef USE_INTERNAL_BULLET
 -DLINK_INTERNAL_BULLET
 #endif
 
--DNO_SPEEX	//disable static speex
+/* disable static speex */
+#ifdef HAVE_SPEEX
+-DNO_SPEEX
+#endif
+
+/* disable static botlib */
 #ifndef BOTLIB_STATIC
--DNO_BOTLIB	//disable static botlib
+-DNO_BOTLIB
 #endif
 
 -DLIBVORBISFILE_STATIC
 
-//-Os //optimise for size instead of speed. less cpu cache needed means that its sometimes faster anyway.
+/* optimise for size instead of speed. less cpu cache needed means that
+ * its sometimes faster.*/
+-Os
 #endif