Revert "Avoid destructive recalculations during poly height changes; f…

…ixes #492" This reverts commit fe20606.
Aleph-One-Marathon · Aug 30, 2024 · f54650b · f54650b
1 parent 836bcfd
commit f54650b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/Source_Files/GameWorld/map.h b/Source_Files/GameWorld/map.h
@@ -1292,8 +1292,8 @@ void precalculate_map_indexes(void);
 
 void touch_polygon(short polygon_index);
 void recalculate_redundant_polygon_data(short polygon_index);
-void recalculate_redundant_endpoint_data(short endpoint_index, bool only_for_heights = false);
-void recalculate_redundant_line_data(short line_index, bool only_for_heights = false);
+void recalculate_redundant_endpoint_data(short endpoint_index);
+void recalculate_redundant_line_data(short line_index);
 void recalculate_redundant_side_data(short side_index, short line_index);
 
 void calculate_endpoint_polygon_owners(short endpoint_index, short *first_index, short *index_count);

diff --git a/Source_Files/GameWorld/map_constructors.cpp b/Source_Files/GameWorld/map_constructors.cpp
@@ -227,8 +227,7 @@ void recalculate_redundant_polygon_data(
 /* calculates solidity, highest adjacent floor and lowest adjacent ceiling; not to be called
 	at runtime. */
 void recalculate_redundant_endpoint_data(
-	short endpoint_index,
-	bool only_for_heights)
+	short endpoint_index)
 {
 	struct endpoint_data *endpoint= get_endpoint_data(endpoint_index);
 	world_distance highest_adjacent_floor_height= INT16_MIN;
@@ -279,12 +278,9 @@ void recalculate_redundant_endpoint_data(
 		}
 	}
 
-	if (!only_for_heights)
-	{
-		SET_ENDPOINT_SOLIDITY(endpoint, solid);
-		SET_ENDPOINT_TRANSPARENCY(endpoint, transparent);
-		SET_ENDPOINT_ELEVATION(endpoint, elevation);
-	}
+	SET_ENDPOINT_SOLIDITY(endpoint, solid);
+	SET_ENDPOINT_TRANSPARENCY(endpoint, transparent);
+	SET_ENDPOINT_ELEVATION(endpoint, elevation);
 	endpoint->highest_adjacent_floor_height= highest_adjacent_floor_height;
 	endpoint->lowest_adjacent_ceiling_height= lowest_adjacent_ceiling_height;
 	endpoint->supporting_polygon_index= supporting_polygon_index;
@@ -293,8 +289,7 @@ void recalculate_redundant_endpoint_data(
 /* calculates line length, highest adjacent floor and lowest adjacent ceiling and calls
 	recalculate_redundant_side_data() on the line’s sides */
 void recalculate_redundant_line_data(
-	short line_index,
-	bool only_for_heights)
+	short line_index)
 {
 	struct line_data *line= get_line_data(line_index);
 	struct side_data *clockwise_side= NULL, *counterclockwise_side= NULL;
@@ -304,9 +299,8 @@ void recalculate_redundant_line_data(
 	bool transparent_texture= false;
 
 	/* recalculate line length */
-	if (only_for_heights)
-		line->length= distance2d(&(get_endpoint_data(line->endpoint_indexes[0])->vertex),
-			&(get_endpoint_data(line->endpoint_indexes[1])->vertex));
+	line->length= distance2d(&(get_endpoint_data(line->endpoint_indexes[0])->vertex),
+		&(get_endpoint_data(line->endpoint_indexes[1])->vertex));
 
 	/* find highest adjacent floor and lowest adjacent ceiling */
 	{
@@ -347,9 +341,6 @@ void recalculate_redundant_line_data(
 		}
 	}
 
-	if (only_for_heights)
-		return;
-
 	if (line->clockwise_polygon_side_index!=NONE)
 	{
 		recalculate_redundant_side_data(line->clockwise_polygon_side_index, line_index);

diff --git a/Source_Files/Lua/lua_map.cpp b/Source_Files/Lua/lua_map.cpp
@@ -739,8 +739,8 @@ static int Lua_Polygon_Floor_Set_Height(lua_State *L)
 	polygon->floor_height = static_cast<world_distance>(lua_tonumber(L,2)*WORLD_ONE);
 	for (short i = 0; i < polygon->vertex_count; ++i)
 	{
-		recalculate_redundant_endpoint_data(polygon->endpoint_indexes[i], true);
-		recalculate_redundant_line_data(polygon->line_indexes[i], true);
+		recalculate_redundant_endpoint_data(polygon->endpoint_indexes[i]);
+		recalculate_redundant_line_data(polygon->line_indexes[i]);
 	}
 	return 0;
 }
@@ -893,8 +893,8 @@ static int Lua_Polygon_Ceiling_Set_Height(lua_State *L)
 	polygon->ceiling_height = static_cast<world_distance>(lua_tonumber(L,2)*WORLD_ONE);
 	for (short i = 0; i < polygon->vertex_count; ++i)
 	{
-		recalculate_redundant_endpoint_data(polygon->endpoint_indexes[i], true);
-		recalculate_redundant_line_data(polygon->line_indexes[i], true);
+		recalculate_redundant_endpoint_data(polygon->endpoint_indexes[i]);
+		recalculate_redundant_line_data(polygon->line_indexes[i]);
 	}
 	return 0;
 }
@@ -1270,7 +1270,6 @@ const luaL_Reg Lua_Polygon_Sides_Metatable[] = {
 	{0, 0}
 };
 
-static void update_line_redundancy(short line_index);
 int Lua_Polygon_Change_Height(lua_State* L)
 {
 	if (!lua_isnumber(L, 2) || !lua_isnumber(L, 3))
@@ -1288,8 +1287,8 @@ int Lua_Polygon_Change_Height(lua_State* L)
 		auto polygon = get_polygon_data(polygon_index);
 		for (auto i = 0; i < polygon->vertex_count; ++i)
 		{
-			recalculate_redundant_line_data(polygon->line_indexes[i], true);
-			recalculate_redundant_endpoint_data(polygon->endpoint_indexes[i], true);
+			recalculate_redundant_line_data(polygon->line_indexes[i]);
+			recalculate_redundant_endpoint_data(polygon->endpoint_indexes[i]);
 		}
 	}