bleh

@@ -40,6 +40,7 @@ newEntity{
 	can_pass = {pass_tree=1},
 	does_block_move = true,
 	block_sight = true,
+	display_z = 85,
 	dig = "GRASS",
 	nice_tiler = { method="replace", base={"TREE", 100, 1, 30}},
 	nice_editer = grass_editer,

@@ -36,6 +36,7 @@ newEntity{
 	can_pass = {pass_wall=1},
 	does_block_move = true,
 	block_sight = true,
+	display_z = 90,
 	air_level = -20,
 	dig = "ROCKY_GROUND",
 	nice_editer = mountain_editer,

@@ -1627,8 +1627,11 @@ static int map_to_screen(lua_State *L)
 				if (mo) {
 					map->sort_mos[smax  ].mo = mo;
 					map->sort_mos[smax  ].i = i;
-					map->sort_mos[smax  ].j = j;
-					map->sort_mos[smax++].z = z;
+					map->sort_mos[smax  ].j = j + roundf(mo->dy);
+					map->sort_mos[smax  ].z = mo->dz;
+					map->sort_mos[smax  ].di = i;
+					map->sort_mos[smax  ].dj = j;
+					map->sort_mos[smax++].dz = z;
 				}
 			}
 		}
@@ -1637,9 +1640,9 @@ static int map_to_screen(lua_State *L)
 
 	for (spos = 0; spos < smax; spos++) {
 		mo = map->sort_mos[spos].mo;
-		i = map->sort_mos[spos].i;
-		j = map->sort_mos[spos].j;
-		z = map->sort_mos[spos].z;
+		i = map->sort_mos[spos].di;
+		j = map->sort_mos[spos].dj;
+		z = map->sort_mos[spos].dz;
 		int dx = x + i * map->tile_w;
 		int dy = y + j * map->tile_h + (i & map->is_hex) * map->tile_h / 2;
 

@@ -63,6 +63,7 @@ typedef struct s_map_object map_object;
 typedef struct {
 	map_object *mo;
 	float i, j, z;
+	float di, dj, dz;
 } map_object_sort;
 
 typedef struct {