ref: 934054806ef04d85c90324db2e05d6f4c6407691
parent: a767c16d830f79a5603b25470101e571b1ed399a
parent: e4a20a983e43757948b339adf110fc9e843009dc
author: Clownacy <[email protected]>
date: Tue Feb 25 12:56:17 EST 2020
Merge branch 'accurate' into portable
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -37,7 +37,7 @@
else
{// Widescreen/tallscreen-safe behaviour
- if (map_w * 16 < WINDOW_WIDTH)
+ if ((map_w - 1) * 16 < WINDOW_WIDTH)
{gFrame.x = -(((WINDOW_WIDTH - ((map_w - 1) * 16)) * 0x200) / 2);
}
@@ -52,7 +52,7 @@
gFrame.x = (((map_w - 1) * 16) - WINDOW_WIDTH) * 0x200;
}
- if (map_l * 16 < WINDOW_HEIGHT)
+ if ((map_l - 1) * 16 < WINDOW_HEIGHT)
{gFrame.y = -(((WINDOW_HEIGHT - ((map_l - 1) * 16)) * 0x200) / 2);
}
@@ -145,7 +145,7 @@
else
{// Widescreen/tallscreen-safe behaviour
- if (map_w * 16 < WINDOW_WIDTH)
+ if ((map_w - 1) * 16 < WINDOW_WIDTH)
{gFrame.x = -(((WINDOW_WIDTH - ((map_w - 1) * 16)) * 0x200) / 2);
}
@@ -158,7 +158,7 @@
gFrame.x = (((map_w - 1) * 16) - WINDOW_WIDTH) * 0x200;
}
- if (map_l * 16 < WINDOW_HEIGHT)
+ if ((map_l - 1) * 16 < WINDOW_HEIGHT)
{gFrame.y = -(((WINDOW_HEIGHT - ((map_l - 1) * 16)) * 0x200) / 2);
}
@@ -219,7 +219,7 @@
else
{// Widescreen/tallscreen-safe behaviour
- if (map_w * 16 < WINDOW_WIDTH)
+ if ((map_w - 1) * 16 < WINDOW_WIDTH)
{gFrame.x = -(((WINDOW_WIDTH - ((map_w - 1) * 16)) * 0x200) / 2);
}
@@ -232,7 +232,7 @@
gFrame.x = (((map_w - 1) * 16) - WINDOW_WIDTH) * 0x200;
}
- if (map_l * 16 < WINDOW_HEIGHT)
+ if ((map_l - 1) * 16 < WINDOW_HEIGHT)
{gFrame.y = -(((WINDOW_HEIGHT - ((map_l - 1) * 16)) * 0x200) / 2);
}