Add enum_to_string

luanti-org · Jan 19, 2025 · 543713e · 543713e
1 parent 59c3b71
commit 543713e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
@@ -33,6 +33,7 @@
 #include "client/shader.h"
 #include "client/minimap.h"
 #include <quaternion.h>
+#include "common/c_content.h" // enum_to_string
 
 class Settings;
 struct ToolCapabilities;
@@ -597,7 +598,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 	if (!m_prop.is_visible)
 		return;
 
-	infostream << "GenericCAO::addToScene(): " << es_ObjectVisual[m_prop.visual].str << std::endl;
+	infostream << "GenericCAO::addToScene(): " << enum_to_string(es_ObjectVisual, m_prop.visual) << std::endl;
 
 	m_material_type_param = 0.5f; // May cut off alpha < 128 depending on m_material_type
 
@@ -768,7 +769,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 		break;
 	} default:
 		infostream << "GenericCAO::addToScene(): \""
-				<< es_ObjectVisual[m_prop.visual].str
+				<< enum_to_string(es_ObjectVisual, m_prop.visual)
 				<< "\" not supported"<<std::endl;
 		break;
 	}

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
@@ -40,7 +40,7 @@ std::string ObjectProperties::dump() const
 	os << ", physical=" << physical;
 	os << ", collideWithObjects=" << collideWithObjects;
 	os << ", collisionbox=" << collisionbox.MinEdge << "," << collisionbox.MaxEdge;
-	os << ", visual=" << es_ObjectVisual[visual].str;
+	os << ", visual=" << enum_to_string(es_ObjectVisual, visual);
 	os << ", mesh=" << mesh;
 	os << ", visual_size=" << visual_size;
 	os << ", textures=[";
@@ -152,7 +152,7 @@ void ObjectProperties::serialize(std::ostream &os) const
 
 	// Convert to string for compatibility
 	// New serialize versions should use the numeric enum value
-	os << serializeString16(es_ObjectVisual[visual].str);
+	os << serializeString16(enum_to_string(es_ObjectVisual, visual));
 
 	writeV3F32(os, visual_size);
 	writeU16(os, textures.size());

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -479,7 +479,7 @@ void push_object_properties(lua_State *L, const ObjectProperties *prop)
 	lua_setfield(L, -2, "selectionbox");
 	push_pointability_type(L, prop->pointable);
 	lua_setfield(L, -2, "pointable");
-	lua_pushstring(L, es_ObjectVisual[prop->visual].str);
+	lua_pushstring(L, enum_to_string(es_ObjectVisual, prop->visual));
 	lua_setfield(L, -2, "visual");
 	lua_pushlstring(L, prop->mesh.c_str(), prop->mesh.size());
 	lua_setfield(L, -2, "mesh");
@@ -1346,6 +1346,17 @@ bool string_to_enum(const EnumString *spec, int &result,
 	return false;
 }
 
+/******************************************************************************/
+const char *enum_to_string(const EnumString *spec, int num)
+{
+	if (num < 0)
+		return nullptr;
+	// assume array order matches enum order
+	auto *p = &spec[num];
+	assert(p->num == num);
+	return p->str;
+}
+
 /******************************************************************************/
 ItemStack read_item(lua_State* L, int index, IItemDefManager *idef)
 {

diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
@@ -167,10 +167,13 @@ std::vector<ItemStack> read_items            (lua_State *L,
 void               push_simplesoundspec      (lua_State *L,
                                               const SoundSpec &spec);
 
+// TODO move EnumString to its own file to not import script code everywhere
 bool               string_to_enum            (const EnumString *spec,
                                               int &result,
                                               const std::string &str);
 
+const char*        enum_to_string            (const EnumString *spec, int num);
+
 bool               read_noiseparams          (lua_State *L, int index,
                                               NoiseParams *np);
 void               push_noiseparams          (lua_State *L, NoiseParams *np);