diff --git a/src/game/client/baseheightmap.cpp b/src/game/client/baseheightmap.cpp
index 4567784c5..5a80c689b 100644
--- a/src/game/client/baseheightmap.cpp
+++ b/src/game/client/baseheightmap.cpp
@@ -1018,15 +1018,15 @@ float BaseHeightMapRenderObjClass::Get_Height_Map_Height(float x, float y, Coord
                 int next_next_row_cell_index = map_width * (index_y + 2) + index_x;
                 unsigned char current_cell_height_data = height_data[current_cell_index];
                 unsigned char right_neighbor_height_data = height_data[current_cell_index + 1];
-                unsigned char bottom_right_neighbor_height_data = data[map_width + 1 + current_cell_index];
-                unsigned char bottom_neighbor_height_data = data[map_width + current_cell_index];
-                unsigned char top_neighbor_height_data = data[prev_row_cell_index];
-                unsigned char top_right_neighbor_height_data = data[prev_row_cell_index + 1];
-                unsigned char down_two_right_neighbor_height_data = data[next_next_row_cell_index + 1];
-                unsigned char down_two_neighbor_height_data = data[next_next_row_cell_index];
-                float slope_1 = right_neighbor_height_data - data[current_cell_index - 1];
-                float slope_2 = data[current_cell_index + 2] - current_cell_height_data;
-                float slope_3 = data[map_width + 2 + current_cell_index] - bottom_neighbor_height_data;
+                unsigned char bottom_right_neighbor_height_data = height_data[map_width + 1 + current_cell_index];
+                unsigned char bottom_neighbor_height_data = height_data[map_width + current_cell_index];
+                unsigned char top_neighbor_height_data = height_data[prev_row_cell_index];
+                unsigned char top_right_neighbor_height_data = height_data[prev_row_cell_index + 1];
+                unsigned char down_two_right_neighbor_height_data = height_data[next_next_row_cell_index + 1];
+                unsigned char down_two_neighbor_height_data = height_data[next_next_row_cell_index];
+                float slope_1 = right_neighbor_height_data - height_data[current_cell_index - 1];
+                float slope_2 = height_data[current_cell_index + 2] - current_cell_height_data;
+                float slope_3 = height_data[map_width + 2 + current_cell_index] - bottom_neighbor_height_data;
                 float slope_4 = bottom_neighbor_height_data - top_neighbor_height_data;
                 float slope_5 = bottom_right_neighbor_height_data - top_right_neighbor_height_data;
                 float slope_6 = down_two_right_neighbor_height_data - right_neighbor_height_data;