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

safe strings in OnlyEnts()

Browse Source
This commit is contained in:
Garux 2021-02-08 02:53:57 +03:00
parent 92b2487875
commit d5f55e7c35
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/quake3/q3map2/bsp.cpp
View File

@ -642,8 +642,6 @@ void ProcessModels( void ){
*/ */
void OnlyEnts( void ){ void OnlyEnts( void ){
char save_cmdline[1024], save_version[1024], save_gridsize[1024];
/* note it */ /* note it */
Sys_Printf( "--- OnlyEnts ---\n" ); Sys_Printf( "--- OnlyEnts ---\n" );
@ -651,9 +649,9 @@ void OnlyEnts( void ){
LoadBSPFile( out ); LoadBSPFile( out );
ParseEntities(); ParseEntities();
strcpyQ( save_cmdline, entities[ 0 ].valueForKey( "_q3map2_cmdline" ), sizeof( save_cmdline ) ); const CopiedString save_cmdline( entities[ 0 ].valueForKey( "_q3map2_cmdline" ) );
strcpyQ( save_version, entities[ 0 ].valueForKey( "_q3map2_version" ), sizeof( save_version ) ); const CopiedString save_version( entities[ 0 ].valueForKey( "_q3map2_version" ) );
strcpyQ( save_gridsize, entities[ 0 ].valueForKey( "gridsize" ), sizeof( save_gridsize ) ); const CopiedString save_gridsize( entities[ 0 ].valueForKey( "gridsize" ) );
entities.clear(); entities.clear();
@ -662,14 +660,14 @@ void OnlyEnts( void ){
SetModelNumbers(); SetModelNumbers();
SetLightStyles(); SetLightStyles();
if ( *save_cmdline ) { if ( !save_cmdline.empty() ) {
entities[0].setKeyValue( "_q3map2_cmdline", save_cmdline ); entities[0].setKeyValue( "_q3map2_cmdline", save_cmdline.c_str() );
} }
if ( *save_version ) { if ( !save_version.empty() ) {
entities[0].setKeyValue( "_q3map2_version", save_version ); entities[0].setKeyValue( "_q3map2_version", save_version.c_str() );
} }
if ( *save_gridsize ) { if ( !save_gridsize.empty() ) {
entities[0].setKeyValue( "gridsize", save_gridsize ); entities[0].setKeyValue( "gridsize", save_gridsize.c_str() );
} }
numBSPEntities = entities.size(); numBSPEntities = entities.size();