remove beeps, fix -dirt* options complaining about invalud option "2"

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

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index 29472a19ad7d501a94107400f5a76b90edda942b..8fbfd1e1334ebd5a249786fe0f19544426b384aa 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -1999,12 +1999,6 @@ int LightMain( int argc, char **argv )
                        Sys_Printf( "Generating deluxemaps for average light direction\n" );
                }
                
-               else if( !strcmp( argv[ i ], "-nodeluxenormalize" ) )
-               {
-                       normalizeDeluxemap = qfalse;
-                       Sys_Printf( "Not normalizing deluxemaps\n" );
-               }
-               
                else if( !strcmp( argv[ i ], "-external" ) )
                {
                        externalLightmaps = qtrue;
@@ -2306,6 +2300,7 @@ int LightMain( int argc, char **argv )
                                Sys_Printf( "Enabling randomized dirtmapping\n" );
                        else
                                Sys_Printf( "Enabling ordered dir mapping\n" );
+                       i++;
                }
                else if( !strcmp( argv[ i ], "-dirtdepth" ) )
                {
@@ -2313,6 +2308,7 @@ int LightMain( int argc, char **argv )
                        if( dirtDepth <= 0.0f )
                                dirtDepth = 128.0f;
                        Sys_Printf( "Dirtmapping depth set to %.1f\n", dirtDepth );
+                       i++;
                }
                else if( !strcmp( argv[ i ], "-dirtscale" ) )
                {
@@ -2320,6 +2316,7 @@ int LightMain( int argc, char **argv )
                        if( dirtScale <= 0.0f )
                                dirtScale = 1.0f;
                        Sys_Printf( "Dirtmapping scale set to %.1f\n", dirtScale );
+                       i++;
                }
                else if( !strcmp( argv[ i ], "-dirtgain" ) )
                {
@@ -2327,6 +2324,7 @@ int LightMain( int argc, char **argv )
                        if( dirtGain <= 0.0f )
                                dirtGain = 1.0f;
                        Sys_Printf( "Dirtmapping gain set to %.1f\n", dirtGain );
+                       i++;
                }
                else if( !strcmp( argv[ i ], "-trianglecheck" ) )
                {
@@ -2339,8 +2337,7 @@ int LightMain( int argc, char **argv )
                /* unhandled args */
                else
                {
-                       Sys_Printf( "WARNING: Unknown argument \"%s\"\a\n", argv[ i ] );
-                       sleep(1);
+                       Sys_Printf( "WARNING: Unknown argument \"%s\"\n", argv[ i ] );
                }
 
        }