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

* packer, repacker: also handle fogs without drawsurfaces

Browse Source
This commit is contained in:
Garux 2020-11-25 10:29:49 +03:00
parent d346f1ee07
commit f30ee07376
3 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/quake3/q3map2/autopk3.c
View File

@ -345,6 +345,10 @@ int pk3BSPMain( int argc, char **argv ){
} }
} }
for( i = 0; i < numBSPFogs; ++i ){
res2list( pk3Shaders, bspFogs[i].shader );
}
//levelshot //levelshot
sprintf( str, "levelshots/%s", nameOFmap ); sprintf( str, "levelshots/%s", nameOFmap );
res2list( pk3Shaders, str ); res2list( pk3Shaders, str );
@ -1019,6 +1023,10 @@ int repackBSPMain( int argc, char **argv ){
} }
} }
for( i = 0; i < numBSPFogs; ++i ){
res2list( pk3Shaders, bspFogs[i].shader );
}
//levelshot //levelshot
sprintf( str, "levelshots/%s", nameOFmap ); sprintf( str, "levelshots/%s", nameOFmap );
res2list( pk3Shaders, str ); res2list( pk3Shaders, str );
@ -1147,9 +1155,9 @@ int repackBSPMain( int argc, char **argv ){
} }
if ( numBSPFogs != 0 ) { if ( numBSPFogs != 0 ) {
Sys_Printf( "freed numBSPFogs\n" ); Sys_Printf( "freed numBSPFogs\n" );
numBSPFogs = 0;
} }
if ( numBSPAds != 0 ) { */ numBSPFogs = 0;
/* if ( numBSPAds != 0 ) {
Sys_Printf( "freed numBSPAds\n" ); Sys_Printf( "freed numBSPAds\n" );
numBSPAds = 0; numBSPAds = 0;
} }

17
tools/quake3/q3map2/bspfile_abstract.c
View File

@ -162,12 +162,12 @@ void SwapBSPFile( void ){
/* shaders (don't swap the name) */ /* shaders (don't swap the name) */
for ( i = 0; i < numBSPShaders ; i++ ) for ( i = 0; i < numBSPShaders ; i++ )
{ {
if ( doingBSP ){ if ( doingBSP ){
si = ShaderInfoForShader( bspShaders[ i ].shader ); si = ShaderInfoForShader( bspShaders[ i ].shader );
if ( si->remapShader && si->remapShader[ 0 ] ) { if ( si->remapShader && si->remapShader[ 0 ] ) {
strcpy( bspShaders[ i ].shader, si->remapShader ); strcpy( bspShaders[ i ].shader, si->remapShader );
}
} }
}
bspShaders[ i ].contentFlags = LittleLong( bspShaders[ i ].contentFlags ); bspShaders[ i ].contentFlags = LittleLong( bspShaders[ i ].contentFlags );
bspShaders[ i ].surfaceFlags = LittleLong( bspShaders[ i ].surfaceFlags ); bspShaders[ i ].surfaceFlags = LittleLong( bspShaders[ i ].surfaceFlags );
} }
@ -389,6 +389,13 @@ void PartialLoadBSPFile( const char *filename ){
/* drawsurfs */ /* drawsurfs */
/* note: rbsp files (and hence q3map2 abstract bsp) have byte lightstyles index arrays, this follows sof2map convention */ /* note: rbsp files (and hence q3map2 abstract bsp) have byte lightstyles index arrays, this follows sof2map convention */
SwapBlock( (int*) bspDrawSurfaces, numBSPDrawSurfaces * sizeof( bspDrawSurfaces[ 0 ] ) ); SwapBlock( (int*) bspDrawSurfaces, numBSPDrawSurfaces * sizeof( bspDrawSurfaces[ 0 ] ) );
/* fogs */
for ( i = 0; i < numBSPFogs; i++ )
{
bspFogs[ i ].brushNum = LittleLong( bspFogs[ i ].brushNum );
bspFogs[ i ].visibleSide = LittleLong( bspFogs[ i ].visibleSide );
}
} }
/* /*

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

@ -536,6 +536,8 @@ void PartialLoadIBSPFile( const char *filename ){
CopyDrawSurfacesLump( header ); CopyDrawSurfacesLump( header );
numBSPFogs = CopyLump( (bspHeader_t*) header, LUMP_FOGS, bspFogs, sizeof( bspFog_t ) ); // TODO fix overflow
bspEntDataSize = CopyLump_Allocate( (bspHeader_t*) header, LUMP_ENTITIES, (void **) &bspEntData, 1, &allocatedBSPEntData ); bspEntDataSize = CopyLump_Allocate( (bspHeader_t*) header, LUMP_ENTITIES, (void **) &bspEntData, 1, &allocatedBSPEntData );
/* free the file buffer */ /* free the file buffer */