Fixup

luanti-org · Jan 16, 2025 · 39c272c · 39c272c
1 parent 0e30370
commit 39c272c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/client/content_cao.cpp b/src/client/content_cao.cpp
@@ -743,7 +743,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 			errorstream<<"GenericCAO::addToScene(): Could not load mesh "<<m_prop.mesh<<std::endl;
 		break;
 	}
-	case OBJECTVISUAL_WIELDITEM_ITEM:
+	case OBJECTVISUAL_WIELDITEMITEM:
 	case OBJECTVISUAL_ITEM: {
 		grabMatrixNode();
 		ItemStack item;
@@ -762,7 +762,7 @@ void GenericCAO::addToScene(ITextureSource *tsrc, scene::ISceneManager *smgr)
 		}
 		m_wield_meshnode = new WieldMeshSceneNode(m_smgr, -1);
 		m_wield_meshnode->setItem(item, m_client,
-			(m_prop.visual == OBJECTVISUAL_WIELDITEM_ITEM));
+			(m_prop.visual == OBJECTVISUAL_WIELDITEMITEM));
 
 		m_wield_meshnode->setScale(m_prop.visual_size / 2.0f);
 		break;
@@ -883,7 +883,7 @@ void GenericCAO::updateLight(u32 day_night_ratio)
 
 void GenericCAO::setNodeLight(const video::SColor &light_color)
 {
-	if (m_prop.visual == OBJECTVISUAL_WIELDITEM_ITEM || m_prop.visual == OBJECTVISUAL_ITEM) {
+	if (m_prop.visual == OBJECTVISUAL_WIELDITEMITEM || m_prop.visual == OBJECTVISUAL_ITEM) {
 		if (m_wield_meshnode)
 			m_wield_meshnode->setNodeLightColor(light_color);
 		return;
@@ -1573,7 +1573,7 @@ bool GenericCAO::visualExpiryRequired(const ObjectProperties &new_) const
 	 */
 
 	bool uses_legacy_texture = new_.wield_item.empty() &&
-		(new_.visual == OBJECTVISUAL_WIELDITEM_ITEM || new_.visual == OBJECTVISUAL_ITEM);
+		(new_.visual == OBJECTVISUAL_WIELDITEMITEM || new_.visual == OBJECTVISUAL_ITEM);
 	// Ordered to compare primitive types before std::vectors
 	return old.backface_culling != new_.backface_culling ||
 		old.is_visible != new_.is_visible ||

diff --git a/src/object_properties.cpp b/src/object_properties.cpp
@@ -22,7 +22,7 @@ const struct EnumString es_ObjectVisual[] =
 	{OBJECTVISUAL_CUBE, "cube"},
 	{OBJECTVISUAL_MESH, "mesh"},
 	{OBJECTVISUAL_ITEM, "item"},
-	{OBJECTVISUAL_WIELDITEM_ITEM, "wielditem_item"},
+	{OBJECTVISUAL_WIELDITEMITEM, "wielditem"},
 	{0, nullptr},
 };
 

diff --git a/src/object_properties.h b/src/object_properties.h
@@ -20,7 +20,7 @@ enum ObjectVisual : u8 {
 	OBJECTVISUAL_CUBE,
 	OBJECTVISUAL_MESH,
 	OBJECTVISUAL_ITEM,
-	OBJECTVISUAL_WIELDITEM_ITEM,
+	OBJECTVISUAL_WIELDITEMITEM,
 };
 
 extern const EnumString es_ObjectVisual[];

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -334,8 +334,13 @@ void read_object_properties(lua_State *L, int index,
 	}
 	lua_pop(L, 1);
 
-	prop->visual = static_cast<ObjectVisual>(getenumfield(L, -1, "visual", es_ObjectVisual,
-		OBJECTVISUAL_UNKNOWN));
+	// Don't set if nil
+	std::string visual;
+	if (getstringfield(L, -1, "visual", visual)) {
+		int result;
+		prop->visual = string_to_enum(es_ObjectVisual, result, visual) ?
+			static_cast<ObjectVisual>(result) : OBJECTVISUAL_UNKNOWN;
+	}
 
 	getstringfield(L, -1, "mesh", prop->mesh);