Radiant:

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

diff --git a/radiant/entity.cpp b/radiant/entity.cpp
index ab3243b0a8f8ea3465ebfe85a8cde0c31e6ea9ab..cc863c611f255fcb2d1b0e03ed212480ffa0d2ea 100644 (file)
--- a/radiant/entity.cpp
+++ b/radiant/entity.cpp
@@ -45,6 +45,9 @@
 #include "qe3.h"
 #include "commands.h"
 
+#include "brushmanip.h"
+#include "patchmanip.h"
+
 struct entity_globals_t
 {
        Vector3 color_entity;
@@ -386,6 +389,18 @@ void Entity_createFromSelection( const char* name, const Vector3& origin ){
                        Node_getEntity( node )->setKeyValue( "model", model );
                }
        }
+
+       if ( string_compare_nocase_n( name, "trigger_", 8 ) == 0 && brushesSelected ){
+               const char* shader = g_pGameDescription->getKeyValue( "shader_trigger" );
+               if ( shader && *shader ){
+                       Scene_PatchSetShader_Selected( GlobalSceneGraph(), shader );
+                       Scene_BrushSetShader_Selected( GlobalSceneGraph(), shader );
+               }
+               else{
+                       Scene_PatchSetShader_Selected( GlobalSceneGraph(), "textures/common/trigger" );
+                       Scene_BrushSetShader_Selected( GlobalSceneGraph(), "textures/common/trigger" );
+               }
+       }
 }
 
 #if 0
@@ -571,7 +586,9 @@ void Entity_constructMenu( GtkMenu* menu ){
        create_menu_item_with_mnemonic( menu, "_Regroup", "GroupSelection" );
        create_menu_item_with_mnemonic( menu, "_Ungroup", "UngroupSelection" );
        create_menu_item_with_mnemonic( menu, "_Connect", "ConnectSelection" );
-       create_menu_item_with_mnemonic( menu, "_KillConnect", "KillConnectSelection" );
+       if ( g_pGameDescription->mGameType == "nexuiz" ) {
+               create_menu_item_with_mnemonic( menu, "_KillConnect", "KillConnectSelection" );
+       }
        create_menu_item_with_mnemonic( menu, "_Select Color...", "EntityColor" );
        create_menu_item_with_mnemonic( menu, "_Normalize Color...", "NormalizeColor" );
 }