"enum class TouchControlMode" -> "enum TouchControlMode : u8"

minetest · Jan 2, 2024 · 951129b · 951129b
1 parent 857b367
commit 951129b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/src/gui/touchscreengui.cpp b/src/gui/touchscreengui.cpp
@@ -1088,7 +1088,7 @@ void TouchScreenGUI::applyContextControls(const TouchInteractionMode &mode)
 
 	switch (m_tap_state) {
 	case TapState::ShortTap:
-		if (mode == TouchInteractionMode::ShortDigLongPlace) {
+		if (mode == SHORT_DIG_LONG_PLACE) {
 			if (!m_dig_pressed) {
 				// The button isn't currently pressed, we can press it.
 				m_dig_pressed_until = now + SIMULATED_CLICK_DURATION_MS;
@@ -1118,7 +1118,7 @@ void TouchScreenGUI::applyContextControls(const TouchInteractionMode &mode)
 		break;
 
 	case TapState::LongTap:
-		if (mode == TouchInteractionMode::ShortDigLongPlace)
+		if (mode == SHORT_DIG_LONG_PLACE)
 			target_place_pressed = true;
 		else
 			target_dig_pressed = true;

diff --git a/src/gui/touchscreengui.h b/src/gui/touchscreengui.h
@@ -32,7 +32,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "itemdef.h"
 #include "client/tile.h"
 #include "client/game.h"
-#include "util/pointedthing.h"
 
 using namespace irr;
 using namespace irr::core;

diff --git a/src/itemdef.cpp b/src/itemdef.cpp
@@ -41,10 +41,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 TouchInteraction::TouchInteraction()
 {
-	pointed_nothing = TouchInteractionMode::LongDigShortPlace;
-	pointed_node    = TouchInteractionMode::LongDigShortPlace;
+	pointed_nothing = LONG_DIG_SHORT_PLACE;
+	pointed_node    = LONG_DIG_SHORT_PLACE;
 	// Map punching to single tap by default.
-	pointed_object  = TouchInteractionMode::ShortDigLongPlace;
+	pointed_object  = SHORT_DIG_LONG_PLACE;
 }
 
 TouchInteractionMode TouchInteraction::getMode(const PointedThing &pointed) const
@@ -63,9 +63,9 @@ TouchInteractionMode TouchInteraction::getMode(const PointedThing &pointed) cons
 
 void TouchInteraction::serialize(std::ostream &os) const
 {
-	writeU8(os, (u8)pointed_nothing);
-	writeU8(os, (u8)pointed_node);
-	writeU8(os, (u8)pointed_object);
+	writeU8(os, pointed_nothing);
+	writeU8(os, pointed_node);
+	writeU8(os, pointed_object);
 }
 
 void TouchInteraction::deSerialize(std::istream &is)

diff --git a/src/itemdef.h b/src/itemdef.h
@@ -50,10 +50,10 @@ enum ItemType
 	ITEM_TOOL,
 };
 
-enum class TouchInteractionMode
+enum TouchInteractionMode : u8
 {
-	LongDigShortPlace,
-	ShortDigLongPlace,
+	LONG_DIG_SHORT_PLACE,
+	SHORT_DIG_LONG_PLACE,
 };
 
 struct TouchInteraction

diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -143,11 +143,11 @@ void read_item_definition(lua_State* L, int index,
 
 		TouchInteraction &inter = def.touch_interaction;
 		inter.pointed_nothing = (TouchInteractionMode)getenumfield(L, -1, "pointed_nothing",
-				es_TouchControlMode, (int)inter.pointed_nothing);
+				es_TouchControlMode, inter.pointed_nothing);
 		inter.pointed_node = (TouchInteractionMode)getenumfield(L, -1, "pointed_node",
-				es_TouchControlMode, (int)inter.pointed_node);
+				es_TouchControlMode, inter.pointed_node);
 		inter.pointed_object = (TouchInteractionMode)getenumfield(L, -1, "pointed_object",
-				es_TouchControlMode, (int)inter.pointed_object);
+				es_TouchControlMode, inter.pointed_object);
 	}
 	lua_pop(L, 1);
 }
@@ -212,11 +212,11 @@ void push_item_definition_full(lua_State *L, const ItemDefinition &i)
 
 	lua_createtable(L, 0, 3);
 	const TouchInteraction &inter = i.touch_interaction;
-	lua_pushstring(L, es_TouchControlMode[(int)inter.pointed_nothing].str);
+	lua_pushstring(L, es_TouchControlMode[inter.pointed_nothing].str);
 	lua_setfield(L, -2,"pointed_nothing");
-	lua_pushstring(L, es_TouchControlMode[(int)inter.pointed_node].str);
+	lua_pushstring(L, es_TouchControlMode[inter.pointed_node].str);
 	lua_setfield(L, -2,"pointed_node");
-	lua_pushstring(L, es_TouchControlMode[(int)inter.pointed_object].str);
+	lua_pushstring(L, es_TouchControlMode[inter.pointed_object].str);
 	lua_setfield(L, -2,"pointed_object");
 	lua_setfield(L, -2, "touch_interaction");
 }

diff --git a/src/script/common/c_types.cpp b/src/script/common/c_types.cpp
@@ -35,7 +35,7 @@ struct EnumString es_ItemType[] =
 
 struct EnumString es_TouchControlMode[] =
 	{
-		{(int)TouchInteractionMode::LongDigShortPlace, "long_dig_short_place"},
-		{(int)TouchInteractionMode::ShortDigLongPlace, "short_dig_long_place"},
+		{LONG_DIG_SHORT_PLACE, "long_dig_short_place"},
+		{SHORT_DIG_LONG_PLACE, "short_dig_long_place"},
 		{0, NULL},
 	};