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

* point entities are understood as miscmodels, if <model attribute is present in xml .ent definition

Browse Source 
* <model key= is not hardcoded to 'model' anymore, can use 'mdl'(q1) or w/e
This commit is contained in:
Garux
2018-01-31 23:14:30 +03:00
parent 387c4c0846
commit f9157a6993
5 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
radiant/eclass_xml.cpp
View File

@@ -208,6 +208,10 @@ AttributeImporter( StringOutputStream& comment, EntityClass* entityClass, const
ASSERT_MESSAGE( string_empty( entityClass->flagnames[bit] ), "non-unique flag bit" );
strcpy( entityClass->flagnames[bit], key );
}
else if( entityClass->fixedsize && string_equal( type, "model" ) ){
entityClass->miscmodel_is = true;
entityClass->m_miscmodel_key = key;
}
m_comment << key;
m_comment << " : ";

7
radiant/entity.cpp
View File

@@ -369,9 +369,8 @@ void Entity_createFromSelection( const char* name, const Vector3& origin ){
EntityClass* entityClass = GlobalEntityClassManager().findOrInsert( name, true );
bool isModel = ( string_compare_nocase_n( name, "misc_", 5 ) == 0 && string_equal_nocase( name + string_length( name ) - 5, "model" ) ) // misc_*model (also misc_model)
|| string_equal_nocase( name, "model_static" )
|| ( GlobalSelectionSystem().countSelected() == 0 && string_equal_nocase( name, "func_static" ) && g_pGameDescription->mGameType == "doom3" );
const bool isModel = EntityClass_miscmodel_is( entityClass )
|| ( GlobalSelectionSystem().countSelected() == 0 && classname_equal( name, "func_static" ) && g_pGameDescription->mGameType == "doom3" );
bool brushesSelected = Scene_countSelectedBrushes( GlobalSceneGraph() ) != 0;
@@ -465,7 +464,7 @@ void Entity_createFromSelection( const char* name, const Vector3& origin ){
if ( isModel ) {
const char* model = misc_model_dialog( GTK_WIDGET( MainFrame_getWindow() ) );
if ( model != 0 ) {
Node_getEntity( node )->setKeyValue( "model", model );
Node_getEntity( node )->setKeyValue( entityClass->miscmodel_key() , model );
}
}
}