support misc_*model as misc_model in the radiant editor (way more convenient)

diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp
index 16dd77494aa99ef5f9346830e0c5c8fe33b97fff..ec02abdaa273167e140412923f6e8e9d27695ea8 100644 (file)
--- a/plugins/entity/entity.cpp
+++ b/plugins/entity/entity.cpp
@@ -50,8 +50,7 @@ EGameType g_gameType;
 
 inline scene::Node& entity_for_eclass(EntityClass* eclass)
 {
 
 inline scene::Node& entity_for_eclass(EntityClass* eclass)
 {

-  if(classname_equal(eclass->name(), "misc_model")
-  || classname_equal(eclass->name(), "misc_gamemodel")
+  if((string_compare_nocase_n(eclass->name(), "misc_", 5) == 0 && string_equal_nocase(eclass->name() + string_length(eclass->name()) - 5, "model")) // misc_*model (also misc_model) // TODO make classname_* wrapper functions for this

   || classname_equal(eclass->name(), "model_static"))
   {
     return New_MiscModel(eclass);
   || classname_equal(eclass->name(), "model_static"))
   {
     return New_MiscModel(eclass);

diff --git a/radiant/entity.cpp b/radiant/entity.cpp
index a572539e65bde0cfd9ba8e557bdda038335792f6..055de6362f10b58b6204326a3f25cc6a08f7df30 100644 (file)
--- a/radiant/entity.cpp
+++ b/radiant/entity.cpp
@@ -328,8 +328,7 @@ void Entity_createFromSelection(const char* name, const Vector3& origin)
 
   EntityClass* entityClass = GlobalEntityClassManager().findOrInsert(name, true);
 
 
   EntityClass* entityClass = GlobalEntityClassManager().findOrInsert(name, true);
 

-  bool isModel = string_equal_nocase(name, "misc_model")
-    || string_equal_nocase(name, "misc_gamemodel")
+  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"));
 
     || string_equal_nocase(name, "model_static")
     || (GlobalSelectionSystem().countSelected() == 0 && string_equal_nocase(name, "func_static"));