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

git-svn-id: svn://svn.icculus.org/netradiant/trunk@116 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c
index 9ffa033a2f5a7ae09c89ef7a76623223e17f3c7d..2b29ff5ec6a34f5ecebb482faf371fd26b8e2253 100644 (file)
--- a/tools/quake3/q3map2/bsp.c
+++ b/tools/quake3/q3map2/bsp.c
@@ -864,7 +864,7 @@ int BSPMain( int argc, char **argv )
                        Sys_Printf( "-bsp argument unnecessary\n" );
                else
                {
-                       Sys_Printf( "WARNING: Unknown option \"%s\"\a\n", argv[ i ] );
+                       Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] );
                }
        }
        

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index 2c8d6a71dd75a157562e212f3a73c09f2feb47b3..8fbfd1e1334ebd5a249786fe0f19544426b384aa 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -2300,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" ) )
                {
@@ -2307,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" ) )
                {
@@ -2314,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" ) )
                {
@@ -2321,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" ) )
                {
@@ -2333,7 +2337,7 @@ int LightMain( int argc, char **argv )
                /* unhandled args */
                else
                {
-                       Sys_Printf( "WARNING: Unknown argument \"%s\"\a\n", argv[ i ] );
+                       Sys_Printf( "WARNING: Unknown argument \"%s\"\n", argv[ i ] );
                }
 
        }

diff --git a/tools/quake3/q3map2/vis.c b/tools/quake3/q3map2/vis.c
index bfb3fe34bbbbb430d592282c9852af274451f28e..dc764ba8e0e89188d4aba44670004a208e7bfc6c 100644 (file)
--- a/tools/quake3/q3map2/vis.c
+++ b/tools/quake3/q3map2/vis.c
@@ -1075,7 +1075,7 @@ int VisMain (int argc, char **argv)
                
                else
                {
-                       Sys_Printf( "WARNING: Unknown option \"%s\"\a\n", argv[ i ] );
+                       Sys_Printf( "WARNING: Unknown option \"%s\"\n", argv[ i ] );
                }
        }