Revert "Merge branch 'Isometric-Dev' into master"

This reverts commit ae0648fccc, reversing
changes made to d7243e8265.
This commit is contained in:
Justin Marshall
2020-08-06 15:50:30 -07:00
parent ae0648fccc
commit 6685b5d51a
433 changed files with 8487 additions and 172344 deletions
+6 -6
View File
@@ -6342,8 +6342,8 @@ if (debug_output) {
smudge_entry.DrawFlags = SHAPE_WIN_REL; // Looks like smudges are drawn top left
smudge_entry.PositionX = xpixel;
smudge_entry.PositionY = ypixel;
smudge_entry.Width = Get_Build_Frame_Width(smudge_type.Get_Image_Data(), 0);
smudge_entry.Height = Get_Build_Frame_Height(smudge_type.Get_Image_Data(), 0);
smudge_entry.Width = Get_Build_Frame_Width(smudge_type.Get_Image_Data());
smudge_entry.Height = Get_Build_Frame_Height(smudge_type.Get_Image_Data());
smudge_entry.CellX = Cell_X(cell);
smudge_entry.CellY = Cell_Y(cell);
smudge_entry.ShapeIndex = cell_ptr->SmudgeData;
@@ -6384,8 +6384,8 @@ if (debug_output) {
overlay_entry.DrawFlags = SHAPE_CENTER|SHAPE_WIN_REL|SHAPE_GHOST; // Looks like overlays are drawn centered and translucent
overlay_entry.PositionX = xpixel + (CELL_PIXEL_W>>1);
overlay_entry.PositionY = ypixel + (CELL_PIXEL_H>>1);
overlay_entry.Width = Get_Build_Frame_Width(overlay_type.Get_Image_Data(), 0);
overlay_entry.Height = Get_Build_Frame_Height(overlay_type.Get_Image_Data(), 0);
overlay_entry.Width = Get_Build_Frame_Width(overlay_type.Get_Image_Data());
overlay_entry.Height = Get_Build_Frame_Height(overlay_type.Get_Image_Data());
overlay_entry.CellX = Cell_X(cell);
overlay_entry.CellY = Cell_Y(cell);
overlay_entry.ShapeIndex = cell_ptr->OverlayData;
@@ -6413,8 +6413,8 @@ if (debug_output) {
flag_entry.DrawFlags = SHAPE_CENTER|SHAPE_GHOST|SHAPE_FADING;
flag_entry.PositionX = xpixel + (ICON_PIXEL_W / 2);
flag_entry.PositionY = ypixel + (ICON_PIXEL_H / 2);
flag_entry.Width = Get_Build_Frame_Width(image_data, 0);
flag_entry.Height = Get_Build_Frame_Height(image_data, 0);
flag_entry.Width = Get_Build_Frame_Width(image_data);
flag_entry.Height = Get_Build_Frame_Height(image_data);
flag_entry.CellX = Cell_X(cell);
flag_entry.CellY = Cell_Y(cell);
flag_entry.ShapeIndex = Frame % 14;