mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Code Issues Releases Wiki Activity

Fix odd issues at certain positions of the map

Browse Source
This commit is contained in:
Ted John
2020-02-21 19:26:30 +00:00
parent d34dec9c27
commit 6e7a7c23c9
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/interface/Viewport.cpp
View File

@@ -1653,8 +1653,11 @@ void get_map_coordinates_from_pos_window(
screenCoords.x = screenCoords.x * myviewport->zoom;
screenCoords.y = screenCoords.y * myviewport->zoom;
screenCoords += myviewport->viewPos;
screenCoords.x &= (0xFFFF * myviewport->zoom) & 0xFFFF;
screenCoords.y &= (0xFFFF * myviewport->zoom) & 0xFFFF;
if (myviewport->zoom > 0)
{
screenCoords.x &= (0xFFFF * myviewport->zoom) & 0xFFFF;
screenCoords.y &= (0xFFFF * myviewport->zoom) & 0xFFFF;
}
rct_drawpixelinfo dpi;
dpi.x = screenCoords.x;
dpi.y = screenCoords.y;

8
src/openrct2/paint/Paint.h
View File

@@ -86,19 +86,15 @@ struct paint_struct
assert_struct_size(paint_struct, 0x34);
#endif
/* size 0x1E */
struct paint_string_struct
{
rct_string_id string_id; // 0x00
paint_string_struct* next; // 0x02
uint16_t x; // 0x06
uint16_t y; // 0x08
int32_t x; // 0x06
int32_t y; // 0x08
uint32_t args[4]; // 0x0A
uint8_t* y_offsets; // 0x1A
};
#ifdef PLATFORM_32BIT
assert_struct_size(paint_string_struct, 0x1e);
#endif
#pragma pack(pop)
union paint_entry