Merge branch 'nomagicpath' into 'master'

[xonotic/netradiant.git] / tools / quake3 / q3map2 / help.c

diff --git a/tools/quake3/q3map2/help.c b/tools/quake3/q3map2/help.c
index 641aed59360e27a4a54d329a49b7ec417adb1071..e253720c82b56d3cdbbbdb5b8d5508e86ca216c7 100644 (file)
--- a/tools/quake3/q3map2/help.c
+++ b/tools/quake3/q3map2/help.c
@@ -101,7 +101,7 @@ void HelpBsp()
                {"-flat", "Enable flat shading (good for combining with -celshader)"},
                {"-fulldetail", "Treat detail brushes as structural ones"},
                {"-leaktest", "Abort if a leak was found"},
-               {"-linefile <filename.lin>", "Line file to write"},
+               {"-linfile <filename.lin>", "Line file to write"},
                {"-meta", "Combine adjacent triangles of the same texture to surfaces (ALWAYS USE THIS)"},
                {"-minsamplesize <N>", "Sets minimum lightmap resolution in luxels/qu"},
                {"-mi <N>", "Sets the maximum number of indexes per surface"},
@@ -137,6 +137,7 @@ void HelpVis()
        struct HelpOption vis[] = {
                {"-vis <filename.map>", "Switch that enters this stage"},
                {"-fast", "Very fast and crude vis calculation"},
+               {"-hint", "Merge all but hint portals"},
                {"-mergeportals", "The less crude half of `-merge`, makes vis sometimes much faster but doesn't hurt fps usually"},
                {"-merge", "Faster but still okay vis calculation"},
                {"-nopassage", "Just use PortalFlow vis (usually less fps)"},
@@ -206,7 +207,10 @@ void HelpLight()
                {"-gridscale <F>", "Scaling factor for the light grid only"},
                {"-keeplights", "Keep light entities in the BSP file after compile"},
                {"-lightmapdir <directory>", "Directory to store external lightmaps (default: same as map name without extension)"},
+               {"-lightmapsearchblocksize <N>", "Restrict lightmap search to block size <N>"},
+               {"-lightmapsearchpower <N>", "Optimize for lightmap merge power <N>"},
                {"-lightmapsize <N>", "Size of lightmaps to generate (must be a power of two)"},
+               {"-lightsubdiv <N>", "Size of light emitting shader subdivision"},
                {"-lomem", "Low memory but slower lighting mode"},
                {"-lowquality", "Low quality floodlight (appears to currently break floodlight)"},
                {"-minsamplesize <N>", "Sets minimum lightmap resolution in luxels/qu"},
@@ -286,6 +290,14 @@ void HelpExport()
        HelpOptions("Exporting lightmaps", 0, 80, exportl, sizeof(exportl)/sizeof(struct HelpOption));
 }
 
+void HelpExportEnts()
+{
+       struct HelpOption exportents[] = {
+               {"-exportents <filename.bsp>", "Exports the entities to a text file (.ent)"},
+       };
+       HelpOptions("ExportEnts Stage", 0, 80, exportents, sizeof(exportents)/sizeof(struct HelpOption));
+}
+
 void HelpFixaas()
 {
        struct HelpOption fixaas[] = {
@@ -343,7 +355,11 @@ void HelpCommon()
                {"-fs_basepath <path>", "Sets the given path as main directory of the game (can be used more than once to look in multiple paths)"},
                {"-fs_game <gamename>", "Sets a different game directory name (default for Q3A: baseq3, can be used more than once)"},
                {"-fs_homebase <dir>", "Specifies where the user home directory name is on Linux (default for Q3A: .q3a)"},
-               {"-fs_pakpath <dir>", "Specify a package directory (can be used more than once to look in multiple paths)"},
+               {"-fs_homepath <path>", "Sets the given path as home directory name"},
+               {"-fs_nobasepath", "Do not load base paths in VFS, imply -fs_nomagicpath"},
+               {"-fs_nomagicpath", "Do not try to guess base path magically"},
+               {"-fs_nohomepath", "Do not load home path in VFS"},
+               {"-fs_pakpath <path>", "Specify a package directory (can be used more than once to look in multiple paths)"},
                {"-game <gamename>", "Load settings for the given game (default: quake3)"},
                {"-subdivisions <F>", "multiplier for patch subdivisions quality"},
                {"-threads <N>", "number of threads to use"},
@@ -369,6 +385,7 @@ void HelpMain(const char* arg)
                {"-scale", "Scaling"},
                {"-convert", "Converting & Decompiling"},
                {"-export", "Exporting lightmaps"},
+               {"-exportents", "Exporting entities"},
                {"-fixaas", "Fixing AAS checksum"},
                {"-info", "Get info about BSP file"},
                {"-import", "Importing lightmaps"},
@@ -382,6 +399,7 @@ void HelpMain(const char* arg)
                HelpScale,
                HelpConvert,
                HelpExport,
+               HelpExportEnts,
                HelpFixaas,
                HelpInfo,
                HelpImport,