From 93f9dc354fc1cc72bf1516fcf792f5f5f9f09bf5 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 4 Jun 2010 20:56:24 +0200 Subject: [PATCH] support misc_*model as misc_model in the radiant editor (way more convenient) --- plugins/entity/entity.cpp | 3 +-- radiant/entity.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp index 16dd774..ec02abd 100644 --- 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) { - 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); diff --git a/radiant/entity.cpp b/radiant/entity.cpp index a572539..055de63 100644 --- 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); - 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")); -- 2.39.2