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

handle fgd spawnflags #115

Browse Source
This commit is contained in:
Garux 2022-12-15 17:28:08 +06:00
parent 5162a22e2d
commit f0ce315ed3
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
radiant/eclass_fgd.cpp
View File

@ -335,12 +335,8 @@ void EntityClassFGD_parseClass( Tokeniser& tokeniser, bool fixedsize, bool isBas
ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, ")" ), PARSE_ERROR ); ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, ")" ), PARSE_ERROR );
if ( string_equal_nocase( type.c_str(), "flags" ) ) { if ( string_equal_nocase( type.c_str(), "flags" ) ) {
EntityClassAttribute attribute;
ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, "=" ), PARSE_ERROR ); ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, "=" ), PARSE_ERROR );
tokeniser.nextLine();
ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, "[" ), PARSE_ERROR ); ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, "[" ), PARSE_ERROR );
tokeniser.nextLine();
for (;; ) for (;; )
{ {
const char* flag = tokeniser.getToken(); const char* flag = tokeniser.getToken();
@ -350,9 +346,16 @@ void EntityClassFGD_parseClass( Tokeniser& tokeniser, bool fixedsize, bool isBas
} }
else else
{ {
const size_t bit = std::log2( atoi( flag ) );
ASSERT_MESSAGE( bit < MAX_FLAGS, "invalid flag bit" << PARSE_ERROR );
ASSERT_MESSAGE( string_empty( entityClass->flagnames[bit] ), "non-unique flag bit" << PARSE_ERROR );
ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, ":" ), PARSE_ERROR ); ASSERT_MESSAGE( EntityClassFGD_parseToken( tokeniser, ":" ), PARSE_ERROR );
//const char* name =
tokeniser.getToken(); const char* name = tokeniser.getToken();
strcpy( entityClass->flagnames[bit], name );
EntityClassAttribute *attribute = &EntityClass_insertAttribute( *entityClass, name, EntityClassAttribute( "flag", name ) ).second;
entityClass->flagAttributes[bit] = attribute;
{ {
const char* defaultSeparator = tokeniser.getToken(); const char* defaultSeparator = tokeniser.getToken();
if ( string_equal( defaultSeparator, ":" ) ) { if ( string_equal( defaultSeparator, ":" ) ) {
@ -360,7 +363,7 @@ void EntityClassFGD_parseClass( Tokeniser& tokeniser, bool fixedsize, bool isBas
{ {
const char* descriptionSeparator = tokeniser.getToken(); const char* descriptionSeparator = tokeniser.getToken();
if ( string_equal( descriptionSeparator, ":" ) ) { if ( string_equal( descriptionSeparator, ":" ) ) {
EntityClassFGD_parseSplitString( tokeniser, attribute.m_description ); EntityClassFGD_parseSplitString( tokeniser, attribute->m_description );
} }
else else
{ {
@ -376,7 +379,6 @@ void EntityClassFGD_parseClass( Tokeniser& tokeniser, bool fixedsize, bool isBas
} }
tokeniser.nextLine(); tokeniser.nextLine();
} }
EntityClass_insertAttribute( *entityClass, key.c_str(), attribute );
} }
else if ( string_equal_nocase( type.c_str(), "choices" ) ) { else if ( string_equal_nocase( type.c_str(), "choices" ) ) {
EntityClassAttribute attribute; EntityClassAttribute attribute;
@ -651,6 +653,13 @@ void EntityClassFGD_resolveInheritance( EntityClass* derivedClass ){
{ {
EntityClass_insertAttribute( *derivedClass, ( *k ).first.c_str(), ( *k ).second ); EntityClass_insertAttribute( *derivedClass, ( *k ).first.c_str(), ( *k ).second );
} }
for( size_t flag = 0; flag < MAX_FLAGS; ++flag ){
if( !string_empty( parentClass->flagnames[flag] ) && string_empty( derivedClass->flagnames[flag] ) ){
strcpy( derivedClass->flagnames[flag], parentClass->flagnames[flag] );
derivedClass->flagAttributes[flag] = parentClass->flagAttributes[flag];
}
}
} }
} }
} }