Merge commit 'dce6730b39a2e6484015e483c46edbe93054f6a0' into garux-merge

[xonotic/netradiant.git] / plugins / entity / entity.cpp

diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp
index 181f9412082ed9c74434b7dbf4701957454e7765..a251bde5c442be67c0438e89cf3ff56ef945932d 100644 (file)
--- a/plugins/entity/entity.cpp
+++ b/plugins/entity/entity.cpp
@@ -307,7 +307,7 @@ bool filter( const Entity& entity ) const {
 }
 };
 
-filter_entity_classname g_filter_entity_world( "worldspawn" );
+//filter_entity_classname g_filter_entity_world( "worldspawn" );
 filter_entity_classname g_filter_entity_func_group( "func_group" );
 filter_entity_classname g_filter_entity_light( "light" );
 filter_entity_classname g_filter_entity_misc_model( "misc_model" );
@@ -327,9 +327,20 @@ bool filter( const Entity& entity ) const {
 filter_entity_doom3model g_filter_entity_doom3model;
 
 
+class filter_entity_world : public EntityFilter
+{
+public:
+bool filter( const Entity& entity ) const {
+       return string_equal( entity.getKeyValue( "classname" ), "worldspawn" )
+                  || string_equal( entity.getKeyValue( "classname" ), "func_group" );
+}
+};
+
+filter_entity_world g_filter_entity_world;
+
 void Entity_InitFilters(){
        add_entity_filter( g_filter_entity_world, EXCLUDE_WORLD );
-       add_entity_filter( g_filter_entity_func_group, EXCLUDE_WORLD );
+       add_entity_filter( g_filter_entity_func_group, EXCLUDE_FUNC_GROUPS );
        add_entity_filter( g_filter_entity_world, EXCLUDE_ENT, true );
        add_entity_filter( g_filter_entity_trigger, EXCLUDE_TRIGGERS );
        add_entity_filter( g_filter_entity_misc_model, EXCLUDE_MODELS );