quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix indentation and typos

Browse Source
This commit is contained in:
Garux 2019-01-27 21:37:37 +03:00
parent 7884d9f1cd
commit 43a5b5513f
3 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
tools/quake3/q3map2/game_xonotic.h
View File

@ -50,101 +50,101 @@
------------------------------------------------------------------------------- */ ------------------------------------------------------------------------------- */
{ {
"xonotic", /* -game x */ "xonotic", /* -game x */
"data", /* default base game data dir */ "data", /* default base game data dir */
".xonotic", /* unix home sub-dir */ ".xonotic", /* unix home sub-dir */
"xonotic", /* magic path word */ "xonotic", /* magic path word */
"scripts", /* shader directory */ "scripts", /* shader directory */
1048575, /* max lightmapped surface verts */ 1048575, /* max lightmapped surface verts */
1048575, /* max surface verts */ 1048575, /* max surface verts */
1048575, /* max surface indexes */ 1048575, /* max surface indexes */
qfalse, /* flares */ qfalse, /* flares */
"flareshader", /* default flare shader */ "flareshader", /* default flare shader */
qfalse, /* wolf lighting model? */ qfalse, /* wolf lighting model? */
128, /* lightmap width/height */ 128, /* lightmap width/height */
1.0f, /* lightmap gamma */ 1.0f, /* lightmap gamma */
qtrue, /* lightmap sRGB */ qtrue, /* lightmap sRGB */
qtrue, /* texture sRGB */ qtrue, /* texture sRGB */
qtrue, /* color sRGB */ qtrue, /* color sRGB */
0.0f, /* lightmap exposure */ 0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */ 1.0f, /* lightmap compensate */
1.0f, /* lightgrid scale */ 1.0f, /* lightgrid scale */
1.0f, /* lightgrid ambient scale */ 1.0f, /* lightgrid ambient scale */
qfalse, /* light angle attenuation uses half-lambert curve */ qfalse, /* light angle attenuation uses half-lambert curve */
qtrue, /* disable shader lightstyles hack */ qtrue, /* disable shader lightstyles hack */
qtrue, /* keep light entities on bsp */ qtrue, /* keep light entities on bsp */
4, /* default patchMeta subdivisions tolerance */ 4, /* default patchMeta subdivisions tolerance */
qtrue, /* patch casting enabled */ qtrue, /* patch casting enabled */
qtrue, /* compile deluxemaps */ qtrue, /* compile deluxemaps */
0, /* deluxemaps default mode */ 0, /* deluxemaps default mode */
512, /* minimap size */ 512, /* minimap size */
1.0f, /* minimap sharpener */ 1.0f, /* minimap sharpener */
1.0f / 66.0f, /* minimap border */ 1.0f / 66.0f, /* minimap border */
qtrue, /* minimap keep aspect */ qtrue, /* minimap keep aspect */
MINIMAP_MODE_GRAY, /* minimap mode */ MINIMAP_MODE_GRAY, /* minimap mode */
"../gfx/%s_mini.tga", /* minimap name format */ "../gfx/%s_mini.tga", /* minimap name format */
"IBSP", /* bsp file prefix */ "IBSP", /* bsp file prefix */
46, /* bsp file version */ 46, /* bsp file version */
qfalse, /* cod-style lump len/ofs order */ qfalse, /* cod-style lump len/ofs order */
LoadIBSPFile, /* bsp load function */ LoadIBSPFile, /* bsp load function */
WriteIBSPFile, /* bsp write function */ WriteIBSPFile, /* bsp write function */
{ {
/* name contentFlags contentFlagsClear surfaceFlags surfaceFlagsClear compileFlags compileFlagsClear */ /* name contentFlags contentFlagsClear surfaceFlags surfaceFlagsClear compileFlags compileFlagsClear */
/* default */ /* default */
{ "default", Q_CONT_SOLID, -1, 0, -1, C_SOLID, -1 }, { "default", Q_CONT_SOLID, -1, 0, -1, C_SOLID, -1 },
/* ydnar */ /* ydnar */
{ "lightgrid", 0, 0, 0, 0, C_LIGHTGRID, 0 }, { "lightgrid", 0, 0, 0, 0, C_LIGHTGRID, 0 },
{ "antiportal", 0, 0, 0, 0, C_ANTIPORTAL, 0 }, { "antiportal", 0, 0, 0, 0, C_ANTIPORTAL, 0 },
{ "skip", 0, 0, 0, 0, C_SKIP, 0 }, { "skip", 0, 0, 0, 0, C_SKIP, 0 },
/* compiler */ /* compiler */
{ "origin", Q_CONT_ORIGIN, Q_CONT_SOLID, 0, 0, C_ORIGIN | C_TRANSLUCENT, C_SOLID }, { "origin", Q_CONT_ORIGIN, Q_CONT_SOLID, 0, 0, C_ORIGIN | C_TRANSLUCENT, C_SOLID },
{ "areaportal", Q_CONT_AREAPORTAL, Q_CONT_SOLID, 0, 0, C_AREAPORTAL | C_TRANSLUCENT, C_SOLID }, { "areaportal", Q_CONT_AREAPORTAL, Q_CONT_SOLID, 0, 0, C_AREAPORTAL | C_TRANSLUCENT, C_SOLID },
{ "trans", Q_CONT_TRANSLUCENT, 0, 0, 0, C_TRANSLUCENT, 0 }, { "trans", Q_CONT_TRANSLUCENT, 0, 0, 0, C_TRANSLUCENT, 0 },
{ "detail", Q_CONT_DETAIL, 0, 0, 0, C_DETAIL, 0 }, { "detail", Q_CONT_DETAIL, 0, 0, 0, C_DETAIL, 0 },
{ "structural", Q_CONT_STRUCTURAL, 0, 0, 0, C_STRUCTURAL, 0 }, { "structural", Q_CONT_STRUCTURAL, 0, 0, 0, C_STRUCTURAL, 0 },
{ "hint", 0, 0, Q_SURF_HINT, 0, C_HINT, 0 }, { "hint", 0, 0, Q_SURF_HINT, 0, C_HINT, 0 },
{ "nodraw", 0, 0, Q_SURF_NODRAW, 0, C_NODRAW, 0 }, { "nodraw", 0, 0, Q_SURF_NODRAW, 0, C_NODRAW, 0 },
{ "alphashadow", 0, 0, Q_SURF_ALPHASHADOW, 0, C_ALPHASHADOW | C_TRANSLUCENT, 0 }, { "alphashadow", 0, 0, Q_SURF_ALPHASHADOW, 0, C_ALPHASHADOW | C_TRANSLUCENT, 0 },
{ "lightfilter", 0, 0, Q_SURF_LIGHTFILTER, 0, C_LIGHTFILTER | C_TRANSLUCENT, 0 }, { "lightfilter", 0, 0, Q_SURF_LIGHTFILTER, 0, C_LIGHTFILTER | C_TRANSLUCENT, 0 },
{ "nolightmap", 0, 0, Q_SURF_VERTEXLIT, 0, C_VERTEXLIT, 0 }, { "nolightmap", 0, 0, Q_SURF_VERTEXLIT, 0, C_VERTEXLIT, 0 },
{ "pointlight", 0, 0, Q_SURF_VERTEXLIT, 0, C_VERTEXLIT, 0 }, { "pointlight", 0, 0, Q_SURF_VERTEXLIT, 0, C_VERTEXLIT, 0 },
/* game */ /* game */
{ "nonsolid", 0, Q_CONT_SOLID, Q_SURF_NONSOLID, 0, 0, C_SOLID }, { "nonsolid", 0, Q_CONT_SOLID, Q_SURF_NONSOLID, 0, 0, C_SOLID },
{ "trigger", Q_CONT_TRIGGER, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID }, { "trigger", Q_CONT_TRIGGER, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "water", Q_CONT_WATER, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID }, { "water", Q_CONT_WATER, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID },
{ "slime", Q_CONT_SLIME, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID }, { "slime", Q_CONT_SLIME, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID },
{ "lava", Q_CONT_LAVA, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID }, { "lava", Q_CONT_LAVA, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID },
{ "playerclip", Q_CONT_PLAYERCLIP, Q_CONT_SOLID, 0, 0, C_DETAIL | C_TRANSLUCENT, C_SOLID }, { "playerclip", Q_CONT_PLAYERCLIP, Q_CONT_SOLID, 0, 0, C_DETAIL | C_TRANSLUCENT, C_SOLID },
{ "monsterclip", Q_CONT_MONSTERCLIP, Q_CONT_SOLID, 0, 0, C_DETAIL | C_TRANSLUCENT, C_SOLID }, { "monsterclip", Q_CONT_MONSTERCLIP, Q_CONT_SOLID, 0, 0, C_DETAIL | C_TRANSLUCENT, C_SOLID },
{ "nodrop", Q_CONT_NODROP, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID }, { "nodrop", Q_CONT_NODROP, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "clusterportal", Q_CONT_CLUSTERPORTAL, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID }, { "clusterportal", Q_CONT_CLUSTERPORTAL, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "donotenter", Q_CONT_DONOTENTER, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID }, { "donotenter", Q_CONT_DONOTENTER, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "botclip", Q_CONT_BOTCLIP, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID }, { "botclip", Q_CONT_BOTCLIP, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "fog", Q_CONT_FOG, Q_CONT_SOLID, 0, 0, C_FOG, C_SOLID }, { "fog", Q_CONT_FOG, Q_CONT_SOLID, 0, 0, C_FOG, C_SOLID },
{ "sky", 0, 0, Q_SURF_SKY, 0, C_SKY, 0 }, { "sky", 0, 0, Q_SURF_SKY, 0, C_SKY, 0 },
{ "slick", 0, 0, Q_SURF_SLICK, 0, 0, 0 }, { "slick", 0, 0, Q_SURF_SLICK, 0, 0, 0 },
{ "noimpact", 0, 0, Q_SURF_NOIMPACT, 0, 0, 0 }, { "noimpact", 0, 0, Q_SURF_NOIMPACT, 0, 0, 0 },
{ "nomarks", 0, 0, Q_SURF_NOMARKS, 0, C_NOMARKS, 0 }, { "nomarks", 0, 0, Q_SURF_NOMARKS, 0, C_NOMARKS, 0 },
{ "ladder", 0, 0, Q_SURF_LADDER, 0, 0, 0 }, { "ladder", 0, 0, Q_SURF_LADDER, 0, 0, 0 },
{ "nodamage", 0, 0, Q_SURF_NODAMAGE, 0, 0, 0 }, { "nodamage", 0, 0, Q_SURF_NODAMAGE, 0, 0, 0 },
{ "metalsteps", 0, 0, Q_SURF_METALSTEPS, 0, 0, 0 }, { "metalsteps", 0, 0, Q_SURF_METALSTEPS, 0, 0, 0 },
{ "flesh", 0, 0, Q_SURF_FLESH, 0, 0, 0 }, { "flesh", 0, 0, Q_SURF_FLESH, 0, 0, 0 },
{ "nosteps", 0, 0, Q_SURF_NOSTEPS, 0, 0, 0 }, { "nosteps", 0, 0, Q_SURF_NOSTEPS, 0, 0, 0 },
{ "nodlight", 0, 0, Q_SURF_NODLIGHT, 0, 0, 0 }, { "nodlight", 0, 0, Q_SURF_NODLIGHT, 0, 0, 0 },
{ "dust", 0, 0, Q_SURF_DUST, 0, 0, 0 }, { "dust", 0, 0, Q_SURF_DUST, 0, 0, 0 },
/* null */ /* null */
{ NULL, 0, 0, 0, 0, 0, 0 } { NULL, 0, 0, 0, 0, 0, 0 }

2
tools/quake3/q3map2/portals.c
View File

@ -97,7 +97,7 @@ qboolean PortalPassable( portal_t *p ){
Error( "Portal_EntityFlood: not a leaf" ); Error( "Portal_EntityFlood: not a leaf" );
} }
/* ydnar: added antiportal to supress portal generation for visibility blocking */ /* ydnar: added antiportal to suppress portal generation for visibility blocking */
if ( p->compileFlags & C_ANTIPORTAL ) { if ( p->compileFlags & C_ANTIPORTAL ) {
return qfalse; return qfalse;
} }

20
tools/quake3/q3map2/q3map2.h
View File

@ -568,7 +568,7 @@ typedef struct game_s
float lightmapGamma; /* default lightmap gamma */ float lightmapGamma; /* default lightmap gamma */
qboolean lightmapsRGB; /* default lightmap sRGB mode */ qboolean lightmapsRGB; /* default lightmap sRGB mode */
qboolean texturesRGB; /* default texture sRGB mode */ qboolean texturesRGB; /* default texture sRGB mode */
qboolean colorsRGB; /* default color sRGB mode */ qboolean colorsRGB; /* default color sRGB mode */
float lightmapExposure; /* default lightmap exposure */ float lightmapExposure; /* default lightmap exposure */
float lightmapCompensate; /* default lightmap compensate value */ float lightmapCompensate; /* default lightmap compensate value */
float gridScale; /* vortex: default lightgrid scale (affects both directional and ambient spectres) */ float gridScale; /* vortex: default lightgrid scale (affects both directional and ambient spectres) */
@ -741,7 +741,7 @@ typedef struct shaderInfo_s
qb_t indexed; /* ydnar: attempt to use indexmap (terrain alphamap style) */ qb_t indexed; /* ydnar: attempt to use indexmap (terrain alphamap style) */
qb_t forceMeta; /* ydnar: force metasurface path */ qb_t forceMeta; /* ydnar: force metasurface path */
qb_t noClip; /* ydnar: don't clip into bsp, preserve original face winding */ qb_t noClip; /* ydnar: don't clip into bsp, preserve original face winding */
qb_t noFast; /* ydnar: supress fast lighting for surfaces with this shader */ qb_t noFast; /* ydnar: suppress fast lighting for surfaces with this shader */
qb_t invert; /* ydnar: reverse facing */ qb_t invert; /* ydnar: reverse facing */
qb_t nonplanar; /* ydnar: for nonplanar meta surface merging */ qb_t nonplanar; /* ydnar: for nonplanar meta surface merging */
qb_t tcGen; /* ydnar: has explicit texcoord generation */ qb_t tcGen; /* ydnar: has explicit texcoord generation */
@ -766,7 +766,7 @@ typedef struct shaderInfo_s
qb_t forceSunlight; /* force sun light at this surface even tho we might not calculate shadows in vertex lighting */ qb_t forceSunlight; /* force sun light at this surface even tho we might not calculate shadows in vertex lighting */
qb_t notjunc; /* don't use this surface for tjunction fixing */ qb_t notjunc; /* don't use this surface for tjunction fixing */
qb_t fogParms; /* ydnar: has fogparms */ qb_t fogParms; /* ydnar: has fogparms */
qb_t noFog; /* ydnar: supress fogging */ qb_t noFog; /* ydnar: suppress fogging */
qb_t clipModel; /* ydnar: solid model hack */ qb_t clipModel; /* ydnar: solid model hack */
qb_t noVertexLight; /* ydnar: leave vertex color alone */ qb_t noVertexLight; /* ydnar: leave vertex color alone */
qb_t noDirty; /* jal: do not apply the dirty pass to this surface */ qb_t noDirty; /* jal: do not apply the dirty pass to this surface */
@ -868,7 +868,7 @@ typedef struct side_s
int compileFlags; /* from shaderInfo */ int compileFlags; /* from shaderInfo */
int value; /* from shaderInfo */ int value; /* from shaderInfo */
qboolean visible; /* choose visble planes first */ qboolean visible; /* choose visible planes first */
qboolean bevel; /* don't ever use for bsp splitting, and don't bother making windings for it */ qboolean bevel; /* don't ever use for bsp splitting, and don't bother making windings for it */
qboolean culled; /* ydnar: face culling */ qboolean culled; /* ydnar: face culling */
} }
@ -1953,11 +1953,11 @@ Q_EXTERN game_t games[]
{ {
#include "game_quake3.h" #include "game_quake3.h"
, ,
#include "game_quakelive.h" /* most be after game_quake3.h as they share defines! */ #include "game_quakelive.h" /* must be after game_quake3.h as they share defines! */
, ,
#include "game_nexuiz.h" /* most be after game_quake3.h as they share defines! */ #include "game_nexuiz.h" /* must be after game_quake3.h as they share defines! */
, ,
#include "game_xonotic.h" /* most be after game_quake3.h as they share defines! */ #include "game_xonotic.h" /* must be after game_quake3.h as they share defines! */
, ,
#include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */ #include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
, ,
@ -1967,7 +1967,7 @@ Q_EXTERN game_t games[]
, ,
#include "game_wolf.h" #include "game_wolf.h"
, ,
#include "game_wolfet.h" /* most be after game_wolf.h as they share defines! */ #include "game_wolfet.h" /* must be after game_wolf.h as they share defines! */
, ,
#include "game_etut.h" #include "game_etut.h"
, ,
@ -1975,9 +1975,9 @@ Q_EXTERN game_t games[]
, ,
#include "game_sof2.h" #include "game_sof2.h"
, ,
#include "game_jk2.h" /* most be after game_sof2.h as they share defines! */ #include "game_jk2.h" /* must be after game_sof2.h as they share defines! */
, ,
#include "game_ja.h" /* most be after game_jk2.h as they share defines! */ #include "game_ja.h" /* must be after game_jk2.h as they share defines! */
, ,
#include "game_qfusion.h" /* qfusion game */ #include "game_qfusion.h" /* qfusion game */
, ,