]> git.xonotic.org Git - xonotic/netradiant.git/blobdiff - tools/quake3/q3map2/main.c
Merge commit 'ffb487e45c26dccd20285849979be1cb261c52f6' into master-merge
[xonotic/netradiant.git] / tools / quake3 / q3map2 / main.c
index 2a95c44ceb475f0b862b5f540c02a6f67eb10490..9f28fdf75048afd8e53f4acce83000b5beefda81 100644 (file)
@@ -269,6 +269,677 @@ int ShiftBSPMain( int argc, char **argv ){
 }
 
 
+void FixDOSName( char *src ){
+       if ( src == NULL ) {
+               return;
+       }
+
+       while ( *src )
+       {
+               if ( *src == '\\' ) {
+                       *src = '/';
+               }
+               src++;
+       }
+}
+
+/*
+       Check if newcoming texture is unique and not excluded
+*/
+void tex2list( char texlist[512][MAX_QPATH], int *texnum, char EXtex[2048][MAX_QPATH], int *EXtexnum ){
+       int i;
+       if ( token[0] == '\0') return;
+       StripExtension( token );
+       FixDOSName( token );
+       for ( i = 0; i < *texnum; i++ ){
+               if ( !Q_stricmp( texlist[i], token ) ) return;
+       }
+       for ( i = 0; i < *EXtexnum; i++ ){
+               if ( !Q_stricmp( EXtex[i], token ) ) return;
+       }
+       strcpy ( texlist[*texnum], token );
+       (*texnum)++;
+       return;
+}
+
+
+/*
+       Check if newcoming res is unique
+*/
+void res2list( char data[512][MAX_QPATH], int *num ){
+       int i;
+       if ( data[*num][0] == '\0') return;
+       for ( i = 0; i < *num; i++ ){
+               if ( !Q_stricmp( data[i], data[*num] ) ) return;
+       }
+       (*num)++;
+       return;
+}
+
+void parseEXblock ( char data[512][MAX_QPATH], int *num, const char *exName ){
+       if ( !GetToken( qtrue ) || strcmp( token, "{" ) ) {
+               Error( "ReadExclusionsFile: %s, line %d: { not found", exName, scriptline );
+       }
+       while ( 1 )
+       {
+               if ( !GetToken( qtrue ) ) {
+                       break;
+               }
+               if ( !strcmp( token, "}" ) ) {
+                       break;
+               }
+               if ( token[0] == '{' ) {
+                       Error( "ReadExclusionsFile: %s, line %d: brace, opening twice in a row.", exName, scriptline );
+               }
+
+               /* add to list */
+               strcpy( data[*num], token );
+               (*num)++;
+       }
+       return;
+}
+
+char q3map2path[1024];
+/*
+   pk3BSPMain()
+   map autopackager, works for Q3 type of shaders and ents
+ */
+
+int pk3BSPMain( int argc, char **argv ){
+       int i, j;
+       qboolean dbg = qfalse, png = qfalse;
+
+       /* process arguments */
+       for ( i = 1; i < ( argc - 1 ); i++ ){
+               if ( !strcmp( argv[ i ],  "-dbg" ) ) {
+                       dbg = qtrue;
+               }
+               else if ( !strcmp( argv[ i ],  "-png" ) ) {
+                       png = qtrue;
+               }
+       }
+
+
+
+       /* do some path mangling */
+       strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
+       StripExtension( source );
+       DefaultExtension( source, ".bsp" );
+
+       /* load the bsp */
+       Sys_Printf( "Loading %s\n", source );
+       LoadBSPFile( source );
+       ParseEntities();
+
+
+       char packname[ 1024 ], base[ 1024 ], nameOFmap[ 1024 ];
+       int len;
+       strcpy( packname, EnginePath );
+
+
+       /* copy map name */
+       strcpy( base, source );
+       StripExtension( base );
+
+       /* extract map name */
+       len = strlen( base ) - 1;
+       while ( len > 0 && base[ len ] != '/' && base[ len ] != '\\' )
+               len--;
+       strcpy( nameOFmap, &base[ len + 1 ] );
+
+
+       qboolean dsSHs[512] = {qfalse};
+
+       for ( i = 0; i < numBSPDrawSurfaces; i++ ){
+               /* can't exclude nodraw patches here (they want shaders :0!) */
+               //if ( !( bspDrawSurfaces[i].surfaceType == 2 && bspDrawSurfaces[i].numIndexes == 0 ) ) dsSHs[bspDrawSurfaces[i].shaderNum] = qtrue;
+               dsSHs[bspDrawSurfaces[i].shaderNum] = qtrue;
+               //Sys_Printf( "%s\n", bspShaders[bspDrawSurfaces[i].shaderNum].shader );
+       }
+
+       int pk3ShadersN = 0;
+       char pk3Shaders[512][MAX_QPATH];
+       int pk3SoundsN = 0;
+       char pk3Sounds[512][MAX_QPATH];
+       int pk3ShaderfilesN = 0;
+       char pk3Shaderfiles[512][MAX_QPATH];
+       int pk3TexturesN = 0;
+       char pk3Textures[512][MAX_QPATH];
+       int pk3VideosN = 0;
+       char pk3Videos[512][MAX_QPATH];
+
+
+
+       for ( i = 0; i < numBSPShaders; i++ ){
+               if ( dsSHs[i] ){
+                       strcpy( pk3Shaders[pk3ShadersN], bspShaders[i].shader );
+                       res2list( pk3Shaders, &pk3ShadersN );
+                       //pk3ShadersN++;
+                       //Sys_Printf( "%s\n", bspShaders[i].shader );
+               }
+       }
+
+       //ent keys
+       epair_t *ep;
+       for ( ep = entities[0].epairs; ep != NULL; ep = ep->next )
+       {
+               if ( !Q_strncasecmp( ep->key, "vertexremapshader", 17 ) ) {
+                       sscanf( ep->value, "%*[^;] %*[;] %s", pk3Shaders[pk3ShadersN] );
+                       res2list( pk3Shaders, &pk3ShadersN );
+               }
+       }
+       strcpy( pk3Sounds[pk3SoundsN], ValueForKey( &entities[0], "music" ) );
+       res2list( pk3Sounds, &pk3SoundsN );
+
+       for ( i = 0; i < numBSPEntities && i < numEntities; i++ )
+       {
+               strcpy( pk3Sounds[pk3SoundsN], ValueForKey( &entities[i], "noise" ) );
+               if ( pk3Sounds[pk3SoundsN][0] != '*' ) res2list( pk3Sounds, &pk3SoundsN );
+
+               if ( !Q_stricmp( ValueForKey( &entities[i], "classname" ), "func_plat" ) ){
+                       strcpy( pk3Sounds[pk3SoundsN], "sound/movers/plats/pt1_strt.wav");
+                       res2list( pk3Sounds, &pk3SoundsN );
+                       strcpy( pk3Sounds[pk3SoundsN], "sound/movers/plats/pt1_end.wav");
+                       res2list( pk3Sounds, &pk3SoundsN );
+               }
+               if ( !Q_stricmp( ValueForKey( &entities[i], "classname" ), "target_push" ) ){
+                       if ( !(IntForKey( &entities[i], "spawnflags") & 1) ){
+                               strcpy( pk3Sounds[pk3SoundsN], "sound/misc/windfly.wav");
+                               res2list( pk3Sounds, &pk3SoundsN );
+                       }
+               }
+               strcpy( pk3Shaders[pk3ShadersN], ValueForKey( &entities[i], "targetShaderNewName" ) );
+               res2list( pk3Shaders, &pk3ShadersN );
+       }
+
+       //levelshot
+       sprintf( pk3Shaders[ pk3ShadersN ], "levelshots/%s", nameOFmap );
+       res2list( pk3Shaders, &pk3ShadersN );
+
+
+       if( dbg ){
+               Sys_Printf( "\tDrawsurface+ent calls....%i\n", pk3ShadersN );
+               for ( i = 0; i < pk3ShadersN; i++ ){
+                       Sys_Printf( "%s\n", pk3Shaders[i] );
+               }
+               Sys_Printf( "\tSounds....%i\n", pk3SoundsN );
+               for ( i = 0; i < pk3SoundsN; i++ ){
+                       Sys_Printf( "%s\n", pk3Sounds[i] );
+               }
+       }
+
+       vfsListShaderFiles( pk3Shaderfiles, &pk3ShaderfilesN );
+
+       if( dbg ){
+               Sys_Printf( "\tSchroider fileses.....%i\n", pk3ShaderfilesN );
+               for ( i = 0; i < pk3ShaderfilesN; i++ ){
+                       Sys_Printf( "%s\n", pk3Shaderfiles[i] );
+               }
+       }
+
+
+       /* load exclusions file */
+       int EXpk3TexturesN = 0;
+       char EXpk3Textures[2048][MAX_QPATH];
+       int EXpk3ShadersN = 0;
+       char EXpk3Shaders[2048][MAX_QPATH];
+       int EXpk3SoundsN = 0;
+       char EXpk3Sounds[2048][MAX_QPATH];
+       int EXpk3ShaderfilesN = 0;
+       char EXpk3Shaderfiles[512][MAX_QPATH];
+       int EXpk3VideosN = 0;
+       char EXpk3Videos[512][MAX_QPATH];
+
+       char exName[ 1024 ];
+       byte *buffer;
+       int size;
+
+       strcpy( exName, q3map2path );
+       char *cut = strrchr( exName, '\\' );
+       char *cut2 = strrchr( exName, '/' );
+       if ( cut == NULL && cut2 == NULL ){
+               Sys_Printf( "WARNING: Unable to load exclusions file.\n" );
+               goto skipEXfile;
+       }
+       if ( cut2 > cut ) cut = cut2;
+       //cut++;
+       cut[1] = '\0';
+       strcat( exName, game->arg );
+       strcat( exName, ".exclude" );
+
+       Sys_Printf( "Loading %s\n", exName );
+       size = TryLoadFile( exName, (void**) &buffer );
+       if ( size <= 0 ) {
+               Sys_Printf( "WARNING: Unable to find exclusions file %s.\n", exName );
+               goto skipEXfile;
+       }
+
+       /* parse the file */
+       ParseFromMemory( (char *) buffer, size );
+
+       /* blocks pointers */
+       //int *exptrN;
+       //char *exptr[512][64];
+
+
+       /* tokenize it */
+       while ( 1 )
+       {
+               /* test for end of file */
+               if ( !GetToken( qtrue ) ) {
+                       break;
+               }
+
+               /* blocks */
+               if ( !Q_stricmp( token, "textures" ) ){
+                       parseEXblock ( EXpk3Textures, &EXpk3TexturesN, exName );
+               }
+               else if ( !Q_stricmp( token, "shaders" ) ){
+                       parseEXblock ( EXpk3Shaders, &EXpk3ShadersN, exName );
+               }
+               else if ( !Q_stricmp( token, "shaderfiles" ) ){
+                       parseEXblock ( EXpk3Shaderfiles, &EXpk3ShaderfilesN, exName );
+               }
+               else if ( !Q_stricmp( token, "sounds" ) ){
+                       parseEXblock ( EXpk3Sounds, &EXpk3SoundsN, exName );
+               }
+               else if ( !Q_stricmp( token, "videos" ) ){
+                       parseEXblock ( EXpk3Videos, &EXpk3VideosN, exName );
+               }
+               else{
+                       Error( "ReadExclusionsFile: %s, line %d: unknown block name!\nValid ones are: textures, shaders, shaderfiles, sounds, videos.", exName, scriptline );
+               }
+       }
+
+       /* free the buffer */
+       free( buffer );
+
+skipEXfile:
+
+       if( dbg ){
+               Sys_Printf( "\tEXpk3Textures....%i\n", EXpk3TexturesN );
+               for ( i = 0; i < EXpk3TexturesN; i++ ) Sys_Printf( "%s\n", EXpk3Textures[i] );
+               Sys_Printf( "\tEXpk3Shaders....%i\n", EXpk3ShadersN );
+               for ( i = 0; i < EXpk3ShadersN; i++ ) Sys_Printf( "%s\n", EXpk3Shaders[i] );
+               Sys_Printf( "\tEXpk3Shaderfiles....%i\n", EXpk3ShaderfilesN );
+               for ( i = 0; i < EXpk3ShaderfilesN; i++ ) Sys_Printf( "%s\n", EXpk3Shaderfiles[i] );
+               Sys_Printf( "\tEXpk3Sounds....%i\n", EXpk3SoundsN );
+               for ( i = 0; i < EXpk3SoundsN; i++ ) Sys_Printf( "%s\n", EXpk3Sounds[i] );
+               Sys_Printf( "\tEXpk3Videos....%i\n", EXpk3VideosN );
+               for ( i = 0; i < EXpk3VideosN; i++ ) Sys_Printf( "%s\n", EXpk3Videos[i] );
+       }
+
+       char temp[ 1024 ];
+
+       //Parse Shader Files
+       for ( i = 0; i < pk3ShaderfilesN; i++ ){
+               qboolean wantShader = qfalse;
+               qboolean wantShaderFile = qfalse;
+               char shadername[ 1024 ];
+               char lastwantedShader[ 1024 ];
+
+
+               /* load the shader */
+               sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] );
+               LoadScriptFile( temp, 0 );
+
+               /* tokenize it */
+               while ( 1 )
+               {
+                       /* test for end of file */
+                       if ( !GetToken( qtrue ) ) {
+                               break;
+                       }
+                       //dump shader names
+                       if( dbg ) Sys_Printf( "%s\n", token );
+
+                       /* do wanna le shader? */
+                       wantShader = qfalse;
+                       for ( j = 0; j < pk3ShadersN; j++ ){
+                               if ( !Q_stricmp( pk3Shaders[j], token) ){
+                                       strcpy ( shadername, pk3Shaders[j] );
+                                       pk3Shaders[j][0] = '\0';
+                                       wantShader = qtrue;
+                                       break;
+                               }
+                       }
+
+                       /* handle { } section */
+                       if ( !GetToken( qtrue ) ) {
+                               break;
+                       }
+                       if ( strcmp( token, "{" ) ) {
+                                       Error( "ParseShaderFile: %s, line %d: { not found!\nFound instead: %s",
+                                               temp, scriptline, token );
+                       }
+
+                       while ( 1 )
+                       {
+                               /* get the next token */
+                               if ( !GetToken( qtrue ) ) {
+                                       break;
+                               }
+                               if ( !strcmp( token, "}" ) ) {
+                                       break;
+                               }
+
+
+                               /* -----------------------------------------------------------------
+                               shader stages (passes)
+                               ----------------------------------------------------------------- */
+
+                               /* parse stage directives */
+                               if ( !strcmp( token, "{" ) ) {
+                                       while ( 1 )
+                                       {
+                                               if ( !GetToken( qtrue ) ) {
+                                                       break;
+                                               }
+                                               if ( !strcmp( token, "}" ) ) {
+                                                       break;
+                                               }
+                                               if ( !wantShader ) continue;
+
+                                               /* digest any images */
+                                               if ( !Q_stricmp( token, "map" ) ||
+                                                       !Q_stricmp( token, "clampMap" ) ) {
+
+                                                       /* get an image */
+                                                       GetToken( qfalse );
+                                                       if ( token[ 0 ] != '*' && token[ 0 ] != '$' ) {
+                                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                                       }
+                                               }
+                                               else if ( !Q_stricmp( token, "animMap" ) ||
+                                                       !Q_stricmp( token, "clampAnimMap" ) ) {
+                                                       GetToken( qfalse );// skip num
+                                                       while ( TokenAvailable() ){
+                                                               GetToken( qfalse );
+                                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                                       }
+                                               }
+                                               else if ( !Q_stricmp( token, "videoMap" ) ){
+                                                       GetToken( qfalse );
+                                                       FixDOSName( token );
+                                                       if ( strchr( token, "/" ) == NULL ){
+                                                               sprintf( temp, "video/%s", token );
+                                                               strcpy( token, temp );
+                                                       }
+                                                       for ( j = 0; j < pk3VideosN; j++ ){
+                                                               if ( !Q_stricmp( pk3Videos[j], token ) ){
+                                                                       goto away;
+                                                               }
+                                                       }
+                                                       for ( j = 0; j < EXpk3VideosN; j++ ){
+                                                               if ( !Q_stricmp( EXpk3Videos[j], token ) ){
+                                                                       goto away;
+                                                               }
+                                                       }
+                                                       strcpy ( pk3Videos[pk3VideosN], token );
+                                                       pk3VideosN++;
+                                                       away:
+                                                       j = 0;
+                                               }
+                                       }
+                               }
+                               /* skip to the next shader */
+                               else if ( !wantShader ) continue;
+
+                               /* -----------------------------------------------------------------
+                               surfaceparm * directives
+                               ----------------------------------------------------------------- */
+
+                               /* match surfaceparm */
+                               else if ( !Q_stricmp( token, "surfaceparm" ) ) {
+                                       GetToken( qfalse );
+                                       if ( !Q_stricmp( token, "nodraw" ) ) {
+                                               wantShader = qfalse;
+                                       }
+                               }
+
+                               /* skyparms <outer image> <cloud height> <inner image> */
+                               else if ( !Q_stricmp( token, "skyParms" ) ) {
+                                       /* get image base */
+                                       GetToken( qfalse );
+
+                                       /* ignore bogus paths */
+                                       if ( Q_stricmp( token, "-" ) && Q_stricmp( token, "full" ) ) {
+                                               strcpy ( temp, token );
+                                               sprintf( token, "%s_up", temp );
+                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                               sprintf( token, "%s_dn", temp );
+                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                               sprintf( token, "%s_lf", temp );
+                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                               sprintf( token, "%s_rt", temp );
+                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                               sprintf( token, "%s_bk", temp );
+                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                               sprintf( token, "%s_ft", temp );
+                                               tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN );
+                                       }
+                                       /* skip rest of line */
+                                       GetToken( qfalse );
+                                       GetToken( qfalse );
+                               }
+                       }
+                       //exclude shader
+                       if ( wantShader ){
+                               for ( j = 0; j < EXpk3ShadersN; j++ ){
+                                       if ( !Q_stricmp( EXpk3Shaders[j], shadername ) ){
+                                               wantShader = qfalse;
+                                               break;
+                                       }
+                               }
+                               /* shouldnt make shaders for shipped with the game textures aswell */
+                               if ( wantShader ){
+                                       for ( j = 0; j < EXpk3TexturesN; j++ ){
+                                               if ( !Q_stricmp( EXpk3Textures[j], shadername ) ){
+                                                       wantShader = qfalse;
+                                                       break;
+                                               }
+                                       }
+                               }
+                               if ( wantShader ){
+                                       wantShaderFile = qtrue;
+                                       strcpy( lastwantedShader, shadername );
+                               }
+                       }
+               }
+               //exclude shader file
+               if ( wantShaderFile ){
+                       for ( j = 0; j < EXpk3ShaderfilesN; j++ ){
+                               if ( !Q_stricmp( EXpk3Shaderfiles[j], pk3Shaderfiles[ i ] ) ){
+                                       Sys_Printf( "WARNING: excluded shader %s, since it was located in restricted shader file: %s\n", lastwantedShader, pk3Shaderfiles[i] );
+                                       pk3Shaderfiles[ i ][0] = '\0';
+                                       break;
+                               }
+                       }
+               }
+               else {
+                       pk3Shaderfiles[ i ][0] = '\0';
+               }
+
+       }
+
+
+
+/* exclude stuff */
+//pure textures (shader ones are done)
+       for ( i = 0; i < pk3ShadersN; i++ ){
+               if ( pk3Shaders[i][0] != '\0' ){
+                       FixDOSName( pk3Shaders[i] );
+                       for ( j = 0; j < pk3TexturesN; j++ ){
+                               if ( !Q_stricmp( pk3Shaders[i], pk3Textures[j] ) ){
+                                       pk3Shaders[i][0] = '\0';
+                                       break;
+                               }
+                       }
+                       if ( pk3Shaders[i][0] == '\0' ) continue;
+                       for ( j = 0; j < EXpk3TexturesN; j++ ){
+                               if ( !Q_stricmp( pk3Shaders[i], EXpk3Textures[j] ) ){
+                                       pk3Shaders[i][0] = '\0';
+                                       break;
+                               }
+                       }
+               }
+       }
+
+//snds
+       for ( i = 0; i < pk3SoundsN; i++ ){
+               FixDOSName( pk3Sounds[i] );
+               for ( j = 0; j < EXpk3SoundsN; j++ ){
+                       if ( !Q_stricmp( pk3Sounds[i], EXpk3Sounds[j] ) ){
+                               pk3Sounds[i][0] = '\0';
+                               break;
+                       }
+               }
+       }
+
+       if( dbg ){
+               Sys_Printf( "\tShader referenced textures....%i\n", pk3TexturesN );
+               for ( i = 0; i < pk3TexturesN; i++ ){
+                       Sys_Printf( "%s\n", pk3Textures[i] );
+               }
+               Sys_Printf( "\tShader files....\n" );
+               for ( i = 0; i < pk3ShaderfilesN; i++ ){
+                       if ( pk3Shaderfiles[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaderfiles[i] );
+               }
+               Sys_Printf( "\tPure textures....\n" );
+               for ( i = 0; i < pk3ShadersN; i++ ){
+                       if ( pk3Shaders[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaders[i] );
+               }
+       }
+
+
+
+       sprintf( packname, "%s/%s_autopacked.pk3", EnginePath, nameOFmap );
+       remove( packname );
+
+       Sys_Printf( "--- ZipZip ---\n" );
+
+       Sys_Printf( "\n\tShader referenced textures....\n" );
+
+       for ( i = 0; i < pk3TexturesN; i++ ){
+               if ( png ){
+                       sprintf( temp, "%s.png", pk3Textures[i] );
+                       if ( vfsPackFile( temp, packname ) ){
+                               Sys_Printf( "++%s\n", temp );
+                               continue;
+                       }
+               }
+               sprintf( temp, "%s.tga", pk3Textures[i] );
+               if ( vfsPackFile( temp, packname ) ){
+                       Sys_Printf( "++%s\n", temp );
+                       continue;
+               }
+               sprintf( temp, "%s.jpg", pk3Textures[i] );
+               if ( vfsPackFile( temp, packname ) ){
+                       Sys_Printf( "++%s\n", temp );
+                       continue;
+               }
+               Sys_Printf( "  !FAIL! %s\n", pk3Textures[i] );
+       }
+
+       Sys_Printf( "\n\tPure textures....\n" );
+
+       for ( i = 0; i < pk3ShadersN; i++ ){
+               if ( pk3Shaders[i][0] != '\0' ){
+                       if ( png ){
+                               sprintf( temp, "%s.png", pk3Shaders[i] );
+                               if ( vfsPackFile( temp, packname ) ){
+                                       Sys_Printf( "++%s\n", temp );
+                                       continue;
+                               }
+                       }
+                       sprintf( temp, "%s.tga", pk3Shaders[i] );
+                       if ( vfsPackFile( temp, packname ) ){
+                               Sys_Printf( "++%s\n", temp );
+                               continue;
+                       }
+                       sprintf( temp, "%s.jpg", pk3Shaders[i] );
+                       if ( vfsPackFile( temp, packname ) ){
+                               Sys_Printf( "++%s\n", temp );
+                               continue;
+                       }
+                       Sys_Printf( "  !FAIL! %s\n", pk3Shaders[i] );
+               }
+       }
+
+       Sys_Printf( "\n\tShaizers....\n" );
+
+       for ( i = 0; i < pk3ShaderfilesN; i++ ){
+               if ( pk3Shaderfiles[i][0] != '\0' ){
+                       sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] );
+                       if ( vfsPackFile( temp, packname ) ){
+                               Sys_Printf( "++%s\n", temp );
+                               continue;
+                       }
+                       Sys_Printf( "  !FAIL! %s\n", pk3Shaders[i] );
+               }
+       }
+
+       Sys_Printf( "\n\tSounds....\n" );
+
+       for ( i = 0; i < pk3SoundsN; i++ ){
+               if ( pk3Sounds[i][0] != '\0' ){
+                       if ( vfsPackFile( pk3Sounds[ i ], packname ) ){
+                               Sys_Printf( "++%s\n", pk3Sounds[ i ] );
+                               continue;
+                       }
+                       Sys_Printf( "  !FAIL! %s\n", pk3Sounds[i] );
+               }
+       }
+
+       Sys_Printf( "\n\tVideos....\n" );
+
+       for ( i = 0; i < pk3VideosN; i++ ){
+               if ( vfsPackFile( pk3Videos[i], packname ) ){
+                       Sys_Printf( "++%s\n", pk3Videos[i] );
+                       continue;
+               }
+               Sys_Printf( "  !FAIL! %s\n", pk3Videos[i] );
+       }
+
+       Sys_Printf( "\n\t.\n" );
+
+       sprintf( temp, "maps/%s.bsp", nameOFmap );
+       if ( vfsPackFile( temp, packname ) ){
+                       Sys_Printf( "++%s\n", temp );
+               }
+       else{
+               Sys_Printf( "  !FAIL! %s\n", temp );
+       }
+
+       sprintf( temp, "maps/%s.aas", nameOFmap );
+       if ( vfsPackFile( temp, packname ) ){
+                       Sys_Printf( "++%s\n", temp );
+               }
+       else{
+               Sys_Printf( "  !FAIL! %s\n", temp );
+       }
+
+       sprintf( temp, "scripts/%s.arena", nameOFmap );
+       if ( vfsPackFile( temp, packname ) ){
+                       Sys_Printf( "++%s\n", temp );
+               }
+       else{
+               Sys_Printf( "  !FAIL! %s\n", temp );
+       }
+
+       sprintf( temp, "scripts/%s.defi", nameOFmap );
+       if ( vfsPackFile( temp, packname ) ){
+                       Sys_Printf( "++%s\n", temp );
+               }
+       else{
+               Sys_Printf( "  !FAIL! %s\n", temp );
+       }
+
+       Sys_Printf( "\nSaved to %s\n", packname );
+       /* return to sender */
+       return 0;
+}
+
 
 /*
    main()
@@ -390,6 +1061,9 @@ int main( int argc, char **argv ){
        Sys_Printf( "Q3Map (ydnar) - v" Q3MAP_VERSION "\n" );
        Sys_Printf( RADIANT_NAME "    - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
        Sys_Printf( "%s\n", Q3MAP_MOTD );
+       Sys_Printf( "%s\n", argv[0] );
+
+       strcpy( q3map2path, argv[0] );//fuer autoPack func
 
        /* ydnar: new path initialization */
        InitPaths( &argc, argv );
@@ -461,6 +1135,11 @@ int main( int argc, char **argv ){
                r = ShiftBSPMain( argc - 1, argv + 1 );
        }
 
+       /* autopacking */
+       else if ( !strcmp( argv[ 1 ], "-pk3" ) ) {
+               r = pk3BSPMain( argc - 1, argv + 1 );
+       }
+
        /* ydnar: bsp conversion */
        else if ( !strcmp( argv[ 1 ], "-convert" ) ) {
                r = ConvertBSPMain( argc - 1, argv + 1 );